From be798871be0d5dbeb70314ba1e5fdfcd202c51ff Mon Sep 17 00:00:00 2001 From: yerkennz Date: Mon, 27 Apr 2026 18:18:25 +0500 Subject: [PATCH 1/2] fix: remove unused packages --- services/backup-daemon/Dockerfile | 2 -- services/backup-daemon/docker/requirements.txt | 2 -- services/patroni/Dockerfile | 1 - services/upgrade/Dockerfile | 1 - 4 files changed, 6 deletions(-) diff --git a/services/backup-daemon/Dockerfile b/services/backup-daemon/Dockerfile index 0e3f9684..bc315410 100644 --- a/services/backup-daemon/Dockerfile +++ b/services/backup-daemon/Dockerfile @@ -43,7 +43,6 @@ RUN apt-get --no-install-recommends install -y comerr-dev \ openssl curl \ vim \ locales -RUN python3 -m pip install -U setuptools==82.0.1 wheel==0.46.2 COPY docker/requirements.txt /root/requirements.txt RUN python3 -m pip install --no-cache-dir -r /root/requirements.txt \ @@ -51,7 +50,6 @@ RUN python3 -m pip install --no-cache-dir -r /root/requirements.txt \ && python3 -m pip install grpcio \ && python3 -m pip install opentelemetry-distro opentelemetry-exporter-otlp opentelemetry-api opentelemetry-sdk opentelemetry-instrumentation-flask \ && opentelemetry-bootstrap -a install \ - && python3 -m pip install "setuptools==82.0.1" "wheel==0.46.2" "jaraco.context==6.1.0" \ && pip3 uninstall -y pip \ && apt-get remove -y --purge gcc-12 \ && apt-get remove -y --purge python3-dev \ diff --git a/services/backup-daemon/docker/requirements.txt b/services/backup-daemon/docker/requirements.txt index dc5b8173..25b0fda9 100644 --- a/services/backup-daemon/docker/requirements.txt +++ b/services/backup-daemon/docker/requirements.txt @@ -22,7 +22,6 @@ gunicorn==23.0.0 httplib2==0.21.0 idna==3.11 importlib-metadata==4.8.3 -jaraco.context==6.1.0 ipaddress==1.0.23 jmespath==1.1.0 kubernetes==31.0.0 @@ -52,5 +51,4 @@ uritemplate==4.1.1 urllib3==2.6.3 websocket-client==1.4.2 Werkzeug==3.1.6 -wheel==0.46.2 zipp==3.23.0 \ No newline at end of file diff --git a/services/patroni/Dockerfile b/services/patroni/Dockerfile index f189af1d..cf100550 100644 --- a/services/patroni/Dockerfile +++ b/services/patroni/Dockerfile @@ -132,7 +132,6 @@ RUN apt-get update && apt-get install -y postgresql-$PG_VERSION-credcheck RUN apt-get install -y alien vmtouch openssh-server RUN cat /root/.pip/pip.conf -RUN python3 -m pip install -U setuptools==78.1.1 wheel==0.38.0 RUN python3 -m pip install psutil patroni[kubernetes,etcd]==3.3.5 psycopg2==2.9.5 requests python-dateutil urllib3 six prettytable --no-cache # Explicitly install patched libaom3 version RUN apt-get --no-install-recommends install -y libaom3=3.3.0-1ubuntu0.1 || apt-get --no-install-recommends install -y libaom3 diff --git a/services/upgrade/Dockerfile b/services/upgrade/Dockerfile index 6035bca5..64bc35db 100644 --- a/services/upgrade/Dockerfile +++ b/services/upgrade/Dockerfile @@ -23,7 +23,6 @@ RUN adduser -uid 26 -gid 26 postgres # Install like base image RUN apt-get --no-install-recommends install -y gcc-12 python3.11 python3-pip python3-dev wget -RUN python3 -m pip install --no-cache-dir --upgrade wheel==0.38.0 setuptools==78.1.1 # Explicitly install patched libaom3 version RUN apt-get --no-install-recommends install -y libaom3=3.3.0-1ubuntu0.1 || apt-get --no-install-recommends install -y libaom3 From 4669fbb29235ae4458a0cfe68f0800212738e558 Mon Sep 17 00:00:00 2001 From: yerkennz Date: Tue, 28 Apr 2026 18:04:55 +0500 Subject: [PATCH 2/2] fix: [CPCAP-9068] vul packages --- services/backup-daemon/Dockerfile | 2 ++ services/backup-daemon/docker/requirements.txt | 2 ++ services/patroni/Dockerfile | 1 + services/upgrade/Dockerfile | 1 + 4 files changed, 6 insertions(+) diff --git a/services/backup-daemon/Dockerfile b/services/backup-daemon/Dockerfile index bc315410..d23c1154 100644 --- a/services/backup-daemon/Dockerfile +++ b/services/backup-daemon/Dockerfile @@ -43,6 +43,7 @@ RUN apt-get --no-install-recommends install -y comerr-dev \ openssl curl \ vim \ locales +RUN python3 -m pip install -U setuptools==82.0.1 wheel==0.47.0 COPY docker/requirements.txt /root/requirements.txt RUN python3 -m pip install --no-cache-dir -r /root/requirements.txt \ @@ -50,6 +51,7 @@ RUN python3 -m pip install --no-cache-dir -r /root/requirements.txt \ && python3 -m pip install grpcio \ && python3 -m pip install opentelemetry-distro opentelemetry-exporter-otlp opentelemetry-api opentelemetry-sdk opentelemetry-instrumentation-flask \ && opentelemetry-bootstrap -a install \ + && python3 -m pip install "setuptools==82.0.1" "wheel==0.47.0" "jaraco.context==6.1.0" \ && pip3 uninstall -y pip \ && apt-get remove -y --purge gcc-12 \ && apt-get remove -y --purge python3-dev \ diff --git a/services/backup-daemon/docker/requirements.txt b/services/backup-daemon/docker/requirements.txt index 25b0fda9..75f30401 100644 --- a/services/backup-daemon/docker/requirements.txt +++ b/services/backup-daemon/docker/requirements.txt @@ -22,6 +22,7 @@ gunicorn==23.0.0 httplib2==0.21.0 idna==3.11 importlib-metadata==4.8.3 +jaraco.context==6.1.0 ipaddress==1.0.23 jmespath==1.1.0 kubernetes==31.0.0 @@ -51,4 +52,5 @@ uritemplate==4.1.1 urllib3==2.6.3 websocket-client==1.4.2 Werkzeug==3.1.6 +wheel==0.47.0 zipp==3.23.0 \ No newline at end of file diff --git a/services/patroni/Dockerfile b/services/patroni/Dockerfile index cf100550..12015e9e 100644 --- a/services/patroni/Dockerfile +++ b/services/patroni/Dockerfile @@ -132,6 +132,7 @@ RUN apt-get update && apt-get install -y postgresql-$PG_VERSION-credcheck RUN apt-get install -y alien vmtouch openssh-server RUN cat /root/.pip/pip.conf +RUN python3 -m pip install -U setuptools==82.0.1 wheel==0.47.0 RUN python3 -m pip install psutil patroni[kubernetes,etcd]==3.3.5 psycopg2==2.9.5 requests python-dateutil urllib3 six prettytable --no-cache # Explicitly install patched libaom3 version RUN apt-get --no-install-recommends install -y libaom3=3.3.0-1ubuntu0.1 || apt-get --no-install-recommends install -y libaom3 diff --git a/services/upgrade/Dockerfile b/services/upgrade/Dockerfile index 64bc35db..8e4f029d 100644 --- a/services/upgrade/Dockerfile +++ b/services/upgrade/Dockerfile @@ -23,6 +23,7 @@ RUN adduser -uid 26 -gid 26 postgres # Install like base image RUN apt-get --no-install-recommends install -y gcc-12 python3.11 python3-pip python3-dev wget +RUN python3 -m pip install --no-cache-dir --upgrade wheel==0.47.0 setuptools==82.0.1 # Explicitly install patched libaom3 version RUN apt-get --no-install-recommends install -y libaom3=3.3.0-1ubuntu0.1 || apt-get --no-install-recommends install -y libaom3