Merge pull request #552 from mdellweg/fix_workaround

Fix workaround for deprecated pulp-content script
pulp · Sep 21, 2023 · 4d07c02 · 4d07c02
2 parents acab2c7 + 3919517
commit 4d07c02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/images/galaxy-minimal/stable/Containerfile.core b/images/galaxy-minimal/stable/Containerfile.core
@@ -9,6 +9,10 @@ RUN pip3 install --upgrade \
   pulpcore${PULPCORE_VERSION} && \
   rm -rf /root/.cache/pip
 
+# Prevent pip-installed /usr/local/bin/pulp-content from getting run instead of
+# our /usr/bin/pulp-content script.
+RUN rm -f /usr/local/bin/pulp-content
+
 USER pulp:pulp
 RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \
     /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link && \

diff --git a/images/pulp-minimal/stable/Containerfile.core b/images/pulp-minimal/stable/Containerfile.core
@@ -27,7 +27,7 @@ RUN pip3 install --upgrade \
 
 # Prevent pip-installed /usr/local/bin/pulp-content from getting run instead of
 # our /usr/bin/pulp-content script.
-RUN rm -r /usr/local/bin/pulp-content
+RUN rm -f /usr/local/bin/pulp-content
 
 USER pulp:pulp
 RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \