From 685af71f5879c00f984ed55ca4081fc176240e6a Mon Sep 17 00:00:00 2001 From: "Joseph S. Tate" Date: Tue, 21 Jan 2025 17:22:47 -0500 Subject: [PATCH] Reduce container layer count by combining RUN commands --- images/pulp-minimal/nightly/Containerfile.webserver | 9 ++++----- images/pulp-minimal/stable/Containerfile.webserver | 9 ++++----- images/pulp/nightly/Containerfile | 6 +++--- images/pulp/stable/Containerfile | 6 +++--- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/images/pulp-minimal/nightly/Containerfile.webserver b/images/pulp-minimal/nightly/Containerfile.webserver index 58cc352f..08dfb3cc 100644 --- a/images/pulp-minimal/nightly/Containerfile.webserver +++ b/images/pulp-minimal/nightly/Containerfile.webserver @@ -2,11 +2,10 @@ ARG FROM_TAG="nightly" FROM pulp/pulp-minimal:${FROM_TAG} as builder RUN mkdir -p /etc/nginx/pulp \ - /www/data -RUN ln $(pip3 show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln $(pip3 show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln $(pip3 show pulp_python | sed -n -e 's/Location: //p')/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf - + /www/data \ + && ln $(pip3 show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf \ + && ln $(pip3 show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf \ + && ln $(pip3 show pulp_python | sed -n -e 's/Location: //p')/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf FROM docker.io/nginx:latest diff --git a/images/pulp-minimal/stable/Containerfile.webserver b/images/pulp-minimal/stable/Containerfile.webserver index 1c3e5b0d..31fa3dc2 100644 --- a/images/pulp-minimal/stable/Containerfile.webserver +++ b/images/pulp-minimal/stable/Containerfile.webserver @@ -2,11 +2,10 @@ ARG FROM_TAG="stable" FROM pulp/pulp-minimal:${FROM_TAG} as builder RUN mkdir -p /etc/nginx/pulp \ - /www/data -RUN ln $(pip3 show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln $(pip3 show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln $(pip3 show pulp_python | sed -n -e 's/Location: //p')/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf - + /www/data \ + && ln $(pip3 show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf \ + && ln $(pip3 show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf \ + && ln $(pip3 show pulp_python | sed -n -e 's/Location: //p')/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf FROM docker.io/nginx:latest diff --git a/images/pulp/nightly/Containerfile b/images/pulp/nightly/Containerfile index 61e6042a..8c479df2 100644 --- a/images/pulp/nightly/Containerfile +++ b/images/pulp/nightly/Containerfile @@ -22,6 +22,6 @@ RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link USER root:root -RUN ln $(pip3 show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln $(pip3 show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln $(pip3 show pulp_python | sed -n -e 's/Location: //p')/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf +RUN ln $(pip3 show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf \ + && ln $(pip3 show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf \ + && ln $(pip3 show pulp_python | sed -n -e 's/Location: //p')/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf diff --git a/images/pulp/stable/Containerfile b/images/pulp/stable/Containerfile index 69cad47a..80c48b63 100644 --- a/images/pulp/stable/Containerfile +++ b/images/pulp/stable/Containerfile @@ -38,9 +38,9 @@ RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link USER root:root -RUN ln $(pip3 show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf -RUN ln $(pip3 show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf -RUN ln $(pip3 show pulp_python | sed -n -e 's/Location: //p')/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf +RUN ln $(pip3 show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf \ + && ln $(pip3 show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf \ + && ln $(pip3 show pulp_python | sed -n -e 's/Location: //p')/pulp_python/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_python.conf RUN \ if [ -n "$PULP_UI_URL" ]; then \