From 7540340e2ad6afc31d482619db765e9ec399197d Mon Sep 17 00:00:00 2001 From: waynedunican Date: Fri, 2 May 2025 15:23:06 +0100 Subject: [PATCH] Fix for ACM Runtime Dockerfile Issue-ID: POLICY-5350 Change-Id: I73d6129d3477255c8c5bbb2e7e3f8eb7fd515119 Signed-off-by: waynedunican --- .../src/main/docker/AcmRuntime.Dockerfile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile index de85d3f09..9889ce1f9 100644 --- a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile @@ -50,18 +50,9 @@ WORKDIR $POLICY_HOME COPY --chown=policy:policy acm-runtime.sh bin/ COPY --chown=policy:policy /maven/policy-clamp-runtime-acm.jar /app/app.jar -RUN if python -c "import setuptools" 2>/dev/null; then \ - pip uninstall -y setuptools; \ - else \ - echo "setuptools not installed, skipping uninstall."; \ - fi +RUN pip uninstall -y setuptools || true -RUN if python3 -c "import pip" 2>/dev/null; then \ - python3 -m pip uninstall -y pip; \ - echo "pip uninstalled."; \ - else \ - echo "pip not installed, skipping uninstall."; \ - fi && \ +RUN python3 -m pip uninstall -y pip || true && \ rm -rf /usr/bin/pip* /usr/local/bin/pip* RUN chmod 755 bin/*.sh -- 2.16.6