From ef918f418dbc369be97d167d0528f9245afb4640 Mon Sep 17 00:00:00 2001 From: yerkennz Date: Mon, 25 May 2026 16:02:14 +0500 Subject: [PATCH 1/2] fix: [CPCAP-9068] remove packages --- services/backup-daemon/Dockerfile | 29 ++++++++++++++++------------- services/patroni/Dockerfile | 14 ++++++++++++-- services/upgrade/Dockerfile | 8 +++++++- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/services/backup-daemon/Dockerfile b/services/backup-daemon/Dockerfile index d23c1154..9bd0169e 100644 --- a/services/backup-daemon/Dockerfile +++ b/services/backup-daemon/Dockerfile @@ -46,19 +46,22 @@ RUN apt-get --no-install-recommends install -y comerr-dev \ 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 \ - && python3 -m pip install --upgrade pip \ - && 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 \ - && apt-get remove -y --purge libpq-dev \ - && apt-get remove -y --purge cython3 \ - && locale-gen en_US.UTF-8 \ - && apt-get clean +RUN python3 -m pip install -U setuptools==82.0.1 wheel==0.47.0 && \ + python3 -m pip install --no-cache-dir -r /root/requirements.txt && \ + python3 -m pip install --upgrade pip && \ + 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 uninstall -y jaraco.context setuptools wheel && \ + rm -rf /usr/local/lib/python3.*/dist-packages/setuptools* \ + /usr/local/lib/python3.*/dist-packages/wheel* \ + /usr/local/lib/python3.*/dist-packages/jaraco* \ + /usr/lib/python3.*/dist-packages/setuptools* \ + /usr/lib/python3.*/dist-packages/wheel* && \ + apt-get remove -y --purge gcc-12 python3-dev libpq-dev cython3 && \ + apt-get autoremove -y && \ + locale-gen en_US.UTF-8 && \ + apt-get clean RUN ln -s /usr/bin/python3 /usr/bin/python diff --git a/services/patroni/Dockerfile b/services/patroni/Dockerfile index 12015e9e..85e56792 100644 --- a/services/patroni/Dockerfile +++ b/services/patroni/Dockerfile @@ -132,8 +132,18 @@ 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 +# 1. Install pip dependencies +# 2. Uninstall pip-managed setuptools, wheel, and jaraco +# 3. Surgically delete system-managed setuptools and wheel folders (leaves pip intact) +RUN python3 -m pip install -U setuptools==82.0.1 wheel==0.47.0 && \ + python3 -m pip install psutil patroni[kubernetes,etcd]==3.3.5 psycopg2==2.9.5 requests python-dateutil urllib3 six prettytable --no-cache && \ + python3 -m pip uninstall -y jaraco.context setuptools wheel && \ + rm -rf /usr/local/lib/python3.10/dist-packages/setuptools* \ + /usr/local/lib/python3.10/dist-packages/wheel* \ + /usr/local/lib/python3.10/dist-packages/jaraco* \ + /usr/lib/python3/dist-packages/setuptools* \ + /usr/lib/python3/dist-packages/wheel* + # 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 RUN mv /var/lib/postgresql /var/lib/pgsql diff --git a/services/upgrade/Dockerfile b/services/upgrade/Dockerfile index 8e4f029d..250c099c 100644 --- a/services/upgrade/Dockerfile +++ b/services/upgrade/Dockerfile @@ -23,7 +23,13 @@ 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 +RUN python3 -m pip install --no-cache-dir --upgrade wheel==0.47.0 setuptools==82.0.1 && \ + python3 -m pip uninstall -y jaraco.context setuptools wheel && \ + rm -rf /usr/local/lib/python3.*/dist-packages/setuptools* \ + /usr/local/lib/python3.*/dist-packages/wheel* \ + /usr/local/lib/python3.*/dist-packages/jaraco* \ + /usr/lib/python3.*/dist-packages/setuptools* \ + /usr/lib/python3.*/dist-packages/wheel* # 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 9fc90e096d341194d8991e61b99b3f6578c45d1e Mon Sep 17 00:00:00 2001 From: yerkennz Date: Mon, 25 May 2026 17:57:15 +0500 Subject: [PATCH 2/2] fix: refresh tag --- .github/workflows/run_tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index cf0a1653..6bb08227 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -28,11 +28,11 @@ jobs: Pgskipper-Pipeline: if: ${{ github.actor != 'dependabot[bot]' && github.event.pull_request.user.login != 'dependabot[bot]' }} needs: Wait-for-images - uses: Netcracker/qubership-test-pipelines/.github/workflows/pgskipper.yaml@34e86efe815cb03fea20efa760989cd21ca0c776 #master + uses: Netcracker/qubership-test-pipelines/.github/workflows/pgskipper.yaml@2e30fa113d505bebf393620ad49e4440a234a0e1 #master with: repository_name: ${{ github.repository }} service_branch: '${{ github.head_ref || github.ref_name }}' - pipeline_branch: '34e86efe815cb03fea20efa760989cd21ca0c776' #this value must match the value after '@' in 'uses' + pipeline_branch: '2e30fa113d505bebf393620ad49e4440a234a0e1' #this value must match the value after '@' in 'uses' secrets: AWS_S3_ACCESS_KEY_ID: ${{secrets.AWS_S3_ACCESS_KEY_ID}} AWS_S3_ACCESS_KEY_SECRET: ${{secrets.AWS_S3_ACCESS_KEY_SECRET}}