From a3eef9386f123a2f15bdcc0856a182046f72e609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20=22decko=22=20de=20Brito?= Date: Tue, 24 Oct 2023 10:59:41 -0300 Subject: [PATCH] Use the official and update nginx image. Closes #557 --- images/galaxy-minimal/nightly/Containerfile.webserver | 3 +-- images/galaxy-minimal/stable/Containerfile.webserver | 3 +-- images/pulp-minimal/nightly/Containerfile.webserver | 3 +-- images/pulp-minimal/stable/Containerfile.webserver | 3 ++- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/images/galaxy-minimal/nightly/Containerfile.webserver b/images/galaxy-minimal/nightly/Containerfile.webserver index 12bf5fe5..3f8a77a2 100644 --- a/images/galaxy-minimal/nightly/Containerfile.webserver +++ b/images/galaxy-minimal/nightly/Containerfile.webserver @@ -10,8 +10,7 @@ RUN ln /usr/local/lib/python3.8/site-packages/galaxy_ng/app/webserver_snippets/n RUN cp -fr /usr/local/lib/python3.8/site-packages/galaxy_ng/app/static/galaxy_ng/. /www/data -FROM docker.io/centos/nginx-116-centos7:1.16 - +FROM docker.io/library/nginx:stable COPY --from=builder /www/data . COPY --from=builder /etc/nginx/pulp/*.conf "${NGINX_DEFAULT_CONF_PATH}"/ diff --git a/images/galaxy-minimal/stable/Containerfile.webserver b/images/galaxy-minimal/stable/Containerfile.webserver index 3dab8603..fec1fcfd 100644 --- a/images/galaxy-minimal/stable/Containerfile.webserver +++ b/images/galaxy-minimal/stable/Containerfile.webserver @@ -10,8 +10,7 @@ RUN ln /usr/local/lib/python3.8/site-packages/galaxy_ng/app/webserver_snippets/n RUN cp -fr /usr/local/lib/python3.8/site-packages/galaxy_ng/app/static/galaxy_ng/. /www/data -FROM docker.io/centos/nginx-116-centos7:1.16 - +FROM docker.io/library/nginx:stable COPY --from=builder /www/data . COPY --from=builder /etc/nginx/pulp/*.conf "${NGINX_DEFAULT_CONF_PATH}"/ diff --git a/images/pulp-minimal/nightly/Containerfile.webserver b/images/pulp-minimal/nightly/Containerfile.webserver index 47a6b697..b344008f 100644 --- a/images/pulp-minimal/nightly/Containerfile.webserver +++ b/images/pulp-minimal/nightly/Containerfile.webserver @@ -9,8 +9,7 @@ RUN ln /usr/local/lib/python3.8/site-packages/pulp_python/app/webserver_snippets -FROM docker.io/centos/nginx-116-centos7:1.16 - +FROM docker.io/library/nginx:stable COPY --from=builder /etc/nginx/pulp/*.conf "${NGINX_DEFAULT_CONF_PATH}"/ diff --git a/images/pulp-minimal/stable/Containerfile.webserver b/images/pulp-minimal/stable/Containerfile.webserver index e1ba624a..dbce5fae 100644 --- a/images/pulp-minimal/stable/Containerfile.webserver +++ b/images/pulp-minimal/stable/Containerfile.webserver @@ -9,7 +9,8 @@ RUN ln /usr/local/lib/python3.8/site-packages/pulp_python/app/webserver_snippets -FROM docker.io/centos/nginx-116-centos7:1.16 +# FROM docker.io/centos/nginx-116-centos7:1.16 +FROM docker.io/library/nginx:stable COPY --from=builder /etc/nginx/pulp/*.conf "${NGINX_DEFAULT_CONF_PATH}"/