From 0e767585d634f0442438ecd1250804b0572dad1c Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Thu, 19 Dec 2024 10:19:13 +0800 Subject: [PATCH] Revert "Move nginx installation into another build step (#897)" (#899) This reverts commit d9633894300a55ab2bc3d35a4b986a11d4bc1fa6. This broke certain assumptions like the `/etc/nginx` directory exists. --- image/base/Dockerfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index 5c1f1ce..e9052ed 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -17,14 +17,6 @@ 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 @@ -99,8 +91,6 @@ 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 @@ -123,6 +113,14 @@ 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