From a222d2414df0be2e6d7ed1868142bdeac7eae368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D1=80=D0=BE=D0=B2=D1=81=D0=BA=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Tue, 27 Oct 2026 00:48:15 +0300 Subject: [PATCH] perf(docker): build nginx once --- .changeset/brave-foxes-compile.md | 5 +++++ packages/alpine-node-nginx/Dockerfile | 8 +------- packages/alpine-node-nginx/Dockerfile-nginx-slim | 6 +----- packages/alpine-node-nginx/Dockerfile-slim | 6 +----- 4 files changed, 8 insertions(+), 17 deletions(-) create mode 100644 .changeset/brave-foxes-compile.md diff --git a/.changeset/brave-foxes-compile.md b/.changeset/brave-foxes-compile.md new file mode 100644 index 00000000..20fb9f10 --- /dev/null +++ b/.changeset/brave-foxes-compile.md @@ -0,0 +1,5 @@ +--- +'arui-scripts-docker': minor +--- + +удалена повторная сборка nginx и удалены дублирующие debug бинарники из docker образов diff --git a/packages/alpine-node-nginx/Dockerfile b/packages/alpine-node-nginx/Dockerfile index bad16559..ec948615 100644 --- a/packages/alpine-node-nginx/Dockerfile +++ b/packages/alpine-node-nginx/Dockerfile @@ -93,10 +93,6 @@ RUN \ cd /usr/src/nginx-$NGINX_VERSION \ && export CFLAGS="${CFLAGS:-} -Wno-unterminated-string-initialization" \ && ./configure $NGINX_CONFIG \ - && make -j$(getconf _NPROCESSORS_ONLN) \ - && mv objs/nginx objs/nginx-debug \ - && mv objs/ngx_http_image_filter_module.so objs/ngx_http_image_filter_module-debug.so \ - && ./configure $NGINX_CONFIG \ && make -j$(getconf _NPROCESSORS_ONLN) RUN \ @@ -107,8 +103,6 @@ RUN \ && mkdir -p /usr/share/nginx/html/ \ && install -m644 html/index.html /usr/share/nginx/html/ \ && install -m644 html/50x.html /usr/share/nginx/html/ \ - && install -m755 objs/nginx-debug /usr/sbin/nginx-debug \ - && install -m755 objs/ngx_http_image_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_image_filter_module-debug.so \ && strip /usr/sbin/nginx* \ && strip /usr/lib/nginx/modules/*.so \ && apk add --no-cache --virtual .gettext gettext \ @@ -126,7 +120,7 @@ FROM ${NODE_BASE_IMAGE}:${NODE_VERSION}-alpine${ALPINE_VERSION} COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt COPY --from=0 /etc/nginx /etc/nginx COPY --from=0 /usr/lib/nginx/modules/*.so /usr/lib/nginx/modules/ -COPY --from=0 /usr/sbin/nginx /usr/sbin/nginx-debug /usr/sbin/ +COPY --from=0 /usr/sbin/nginx /usr/sbin/nginx COPY --from=0 /usr/share/nginx/html/* /usr/share/nginx/html/ COPY --from=0 /usr/bin/envsubst /usr/local/bin/envsubst diff --git a/packages/alpine-node-nginx/Dockerfile-nginx-slim b/packages/alpine-node-nginx/Dockerfile-nginx-slim index 322fa99d..5773104b 100644 --- a/packages/alpine-node-nginx/Dockerfile-nginx-slim +++ b/packages/alpine-node-nginx/Dockerfile-nginx-slim @@ -79,9 +79,6 @@ RUN \ cd /usr/src/nginx-$NGINX_VERSION \ && export CFLAGS="${CFLAGS:-} -Wno-unterminated-string-initialization" \ && ./configure $NGINX_CONFIG \ - && make -j$(getconf _NPROCESSORS_ONLN) \ - && mv objs/nginx objs/nginx-debug \ - && ./configure $NGINX_CONFIG \ && make -j$(getconf _NPROCESSORS_ONLN) RUN \ @@ -92,7 +89,6 @@ RUN \ && mkdir -p /usr/share/nginx/html/ \ && install -m644 html/index.html /usr/share/nginx/html/ \ && install -m644 html/50x.html /usr/share/nginx/html/ \ - && install -m755 objs/nginx-debug /usr/sbin/nginx-debug \ && strip /usr/sbin/nginx* \ && apk add --no-cache --virtual .gettext gettext \ && scanelf --needed --nobanner /usr/sbin/nginx /usr/bin/envsubst \ @@ -107,7 +103,7 @@ FROM alpine:${ALPINE_VERSION} COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt COPY --from=0 /etc/nginx /etc/nginx -COPY --from=0 /usr/sbin/nginx /usr/sbin/nginx-debug /usr/sbin/ +COPY --from=0 /usr/sbin/nginx /usr/sbin/nginx COPY --from=0 /usr/share/nginx/html/* /usr/share/nginx/html/ COPY --from=0 /usr/bin/envsubst /usr/local/bin/envsubst diff --git a/packages/alpine-node-nginx/Dockerfile-slim b/packages/alpine-node-nginx/Dockerfile-slim index 8d524235..fbe2122a 100644 --- a/packages/alpine-node-nginx/Dockerfile-slim +++ b/packages/alpine-node-nginx/Dockerfile-slim @@ -80,9 +80,6 @@ RUN \ cd /usr/src/nginx-$NGINX_VERSION \ && export CFLAGS="${CFLAGS:-} -Wno-unterminated-string-initialization" \ && ./configure $NGINX_CONFIG \ - && make -j$(getconf _NPROCESSORS_ONLN) \ - && mv objs/nginx objs/nginx-debug \ - && ./configure $NGINX_CONFIG \ && make -j$(getconf _NPROCESSORS_ONLN) RUN \ @@ -93,7 +90,6 @@ RUN \ && mkdir -p /usr/share/nginx/html/ \ && install -m644 html/index.html /usr/share/nginx/html/ \ && install -m644 html/50x.html /usr/share/nginx/html/ \ - && install -m755 objs/nginx-debug /usr/sbin/nginx-debug \ && strip /usr/sbin/nginx* \ && apk add --no-cache --virtual .gettext gettext \ && scanelf --needed --nobanner /usr/sbin/nginx /usr/bin/envsubst \ @@ -109,7 +105,7 @@ FROM ${NODE_BASE_IMAGE}:${NODE_VERSION}-alpine${ALPINE_VERSION} COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt COPY --from=0 /etc/nginx /etc/nginx -COPY --from=0 /usr/sbin/nginx /usr/sbin/nginx-debug /usr/sbin/ +COPY --from=0 /usr/sbin/nginx /usr/sbin/nginx COPY --from=0 /usr/share/nginx/html/* /usr/share/nginx/html/ COPY --from=0 /usr/bin/envsubst /usr/local/bin/envsubst