From: waynedunican <wayne.dunican@est.tech>
Date: Fri, 2 May 2025 14:23:06 +0000 (+0100)
Subject: Fix for ACM Runtime Dockerfile
X-Git-Tag: 8.2.0~13
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F140841%2F1;p=policy%2Fclamp.git

Fix for ACM Runtime Dockerfile

Issue-ID: POLICY-5350
Change-Id: I73d6129d3477255c8c5bbb2e7e3f8eb7fd515119
Signed-off-by: waynedunican <wayne.dunican@est.tech>
---

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