From 39195173c7d98384b86fde50ea1647b37d687dd9 Mon Sep 17 00:00:00 2001 From: Matthias Dellweg Date: Thu, 21 Sep 2023 15:50:15 +0200 Subject: [PATCH] Fix workaround for deprecated pulp-content script [noissue] --- images/galaxy-minimal/stable/Containerfile.core | 4 ++++ images/pulp-minimal/stable/Containerfile.core | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/images/galaxy-minimal/stable/Containerfile.core b/images/galaxy-minimal/stable/Containerfile.core index c68a76b0..d28a132c 100644 --- 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 index 674638db..8adf72d7 100644 --- 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 \