temp

[noissue] Co-authored-by: decko <decko@redhat.com>
pulp · Oct 12, 2023 · 7fb3df8 · 7fb3df8
1 parent 0cf0b18
commit 7fb3df8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/images/galaxy-minimal/nightly/Containerfile.webserver b/images/galaxy-minimal/nightly/Containerfile.webserver
@@ -7,7 +7,7 @@ RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippet
 RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf
 RUN ln /usr/local/lib/python3.9/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf
 
-RUN cp -fr /usr/local/lib/python3.8/site-packages/galaxy_ng/app/static/galaxy_ng/. /www/data
+RUN cp -fr /usr/local/lib/python3.9/site-packages/galaxy_ng/app/static/galaxy_ng/. /www/data
 
 
 FROM docker.io/centos/nginx-116-centos7:1.16

diff --git a/images/galaxy-minimal/stable/Containerfile.webserver b/images/galaxy-minimal/stable/Containerfile.webserver
@@ -7,7 +7,7 @@ RUN ln /usr/local/lib/python3.9/site-packages/pulp_ansible/app/webserver_snippet
 RUN ln /usr/local/lib/python3.9/site-packages/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf
 RUN ln /usr/local/lib/python3.9/site-packages/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy_ng.conf
 
-RUN cp -fr /usr/local/lib/python3.8/site-packages/galaxy_ng/app/static/galaxy_ng/. /www/data
+RUN cp -fr /usr/local/lib/python3.9/site-packages/galaxy_ng/app/static/galaxy_ng/. /www/data
 
 
 FROM docker.io/centos/nginx-116-centos7:1.16

diff --git a/images/pulp-minimal/stable/Containerfile.core b/images/pulp-minimal/stable/Containerfile.core
@@ -25,10 +25,6 @@ RUN pip3 install --upgrade \
   pulp-ostree${PULP_OSTREE_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/s6_assets/s6-rc.d/redis/run b/images/s6_assets/s6-rc.d/redis/run
@@ -1,3 +1,3 @@
 #!/usr/bin/execlineb -P
 s6-setuidgid redis
-/usr/bin/redis-server /etc/redis.conf
+/usr/bin/redis-server /etc/redis/redis.conf