Skip to content

perf(docker): build nginx once #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmitrbrvsk wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −17
Open

perf(docker): build nginx once #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/brave-foxes-compile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'arui-scripts-docker': minor
---

удалена повторная сборка nginx и удалены дублирующие debug бинарники из docker образов
8 changes: 1 addition & 7 deletions packages/alpine-node-nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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

Expand Down
6 changes: 1 addition & 5 deletions packages/alpine-node-nginx/Dockerfile-nginx-slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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

Expand Down
6 changes: 1 addition & 5 deletions packages/alpine-node-nginx/Dockerfile-slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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

Expand Down
Loading