From f8be37087d92c575ed51dba6a9a85ec6035ad25d Mon Sep 17 00:00:00 2001 From: Gerrod Ubben Date: Tue, 8 Oct 2024 12:00:47 -0400 Subject: [PATCH] Remove installing pulpcore in non-s6 base image [noissue] --- images/Containerfile.core.base | 9 +-------- images/galaxy/stable/Containerfile.core | 2 +- images/pulp/stable/Containerfile.core | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/images/Containerfile.core.base b/images/Containerfile.core.base index 6c604809..501b7e1c 100644 --- a/images/Containerfile.core.base +++ b/images/Containerfile.core.base @@ -65,8 +65,7 @@ RUN pip install \ gunicorn \ python-nginx \ "django-storages[boto3,azure]>=1.12.2" \ - "requests[use_chardet_on_py3]" \ - pulpcore + "requests[use_chardet_on_py3]" RUN groupadd -g 700 --system pulp RUN useradd -d /var/lib/pulp --system -u 700 -g pulp pulp @@ -82,12 +81,6 @@ RUN mkdir -p /etc/pulp/certs \ # https://github.com/python-ldap/python-ldap/issues/432#issuecomment-1016756358 RUN ln -s /usr/lib64/libldap.so /usr/lib64/libldap_r.so -RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ - /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link - -RUN chown pulp:pulp -R /var/lib/pulp \ - /var/lib/operator/static - COPY images/assets/readyz.py /usr/bin/readyz.py COPY images/assets/route_paths.py /usr/bin/route_paths.py COPY images/assets/wait_on_postgres.py /usr/bin/wait_on_postgres.py diff --git a/images/galaxy/stable/Containerfile.core b/images/galaxy/stable/Containerfile.core index 42bc1efa..5287e8b4 100644 --- a/images/galaxy/stable/Containerfile.core +++ b/images/galaxy/stable/Containerfile.core @@ -8,4 +8,4 @@ RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ USER root:root RUN chmod 2775 /var/lib/pulp/{scripts,media,tmp,assets} -RUN chown :root /var/lib/pulp/{scripts,media,tmp,assets} +RUN chown -R :root /var/lib/pulp/{scripts,media,tmp,assets} /var/lib/operator/static diff --git a/images/pulp/stable/Containerfile.core b/images/pulp/stable/Containerfile.core index 3879ab53..a8ec4e90 100644 --- a/images/pulp/stable/Containerfile.core +++ b/images/pulp/stable/Containerfile.core @@ -15,4 +15,4 @@ RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ USER root:root RUN chmod 2775 /var/lib/pulp/{scripts,media,tmp,assets} -RUN chown :root /var/lib/pulp/{scripts,media,tmp,assets} +RUN chown -R :root /var/lib/pulp/{scripts,media,tmp,assets} /var/lib/operator/static