Remove installing pulpcore in non-s6 base image

[noissue]
pulp · Oct 8, 2024 · f8be370 · f8be370
1 parent 52ea4e6
commit f8be370
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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