From d9633894300a55ab2bc3d35a4b986a11d4bc1fa6 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Wed, 18 Dec 2024 07:07:26 +0800 Subject: [PATCH] Move nginx installation into another build step (#897) Avoids polluting the main image with nginx's build dependencies --- image/base/Dockerfile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index e9052ed..5c1f1ce 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -17,6 +17,14 @@ FROM builder AS imagemagick_builder ADD install-imagemagick /tmp/install-imagemagick RUN /tmp/install-imagemagick +FROM builder AS nginx_builder +# From https://nginx.org/en/pgp_keys.html +ADD nginx_public_keys.key /tmp/nginx_public_keys.key +ADD install-nginx /tmp/install-nginx +RUN gpg --import /tmp/nginx_public_keys.key &&\ + rm /tmp/nginx_public_keys.key &&\ + /tmp/install-nginx + FROM discourse/ruby:3.3.6-${DEBIAN_RELEASE}-slim AS discourse_dependencies ARG DEBIAN_RELEASE @@ -91,6 +99,8 @@ RUN sed -i "s/^# $LANG/$LANG/" /etc/locale.gen; \ RUN --mount=type=tmpfs,target=/root/.npm \ npm install -g terser uglify-js pnpm +COPY --from=nginx_builder /usr/sbin/nginx /usr/sbin + # Copy binary and configuration files for magick COPY --from=imagemagick_builder /usr/local/bin/magick /usr/local/bin/magick COPY --from=imagemagick_builder /usr/local/etc/ImageMagick-7 /usr/local/etc/ImageMagick-7 @@ -113,14 +123,6 @@ RUN ln -s /usr/local/bin/magick /usr/local/bin/animate &&\ ADD install-jemalloc /tmp/install-jemalloc RUN /tmp/install-jemalloc -# From https://nginx.org/en/pgp_keys.html -ADD nginx_public_keys.key /tmp/nginx_public_keys.key -ADD install-nginx /tmp/install-nginx - -RUN gpg --import /tmp/nginx_public_keys.key &&\ - rm /tmp/nginx_public_keys.key &&\ - /tmp/install-nginx - ADD install-redis /tmp/install-redis RUN /tmp/install-redis