Skip to content

Commit c300144

Browse files
committed
modules: use NGINX_FROM_IMAGE to specify which image to start with.
1 parent 46a0d48 commit c300144

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

modules/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG NGINX_VERSION_FROM=mainline
2-
FROM nginx:${NGINX_VERSION_FROM} as builder
1+
ARG NGINX_FROM_IMAGE=nginx:mainline
2+
FROM ${NGINX_FROM_IMAGE} as builder
33

44
ARG ENABLED_MODULES
55

@@ -69,7 +69,7 @@ RUN set -ex \
6969
done \
7070
&& echo "BUILT_MODULES=\"$BUILT_MODULES\"" > /tmp/packages/modules.env
7171

72-
FROM nginx:${NGINX_VERSION_FROM}
72+
FROM ${NGINX_FROM_IMAGE}
7373
COPY --from=builder /tmp/packages /tmp/packages
7474
RUN set -ex \
7575
&& apt update \

modules/Dockerfile.alpine

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG NGINX_VERSION_FROM=mainline-alpine
2-
FROM nginx:${NGINX_VERSION_FROM}-alpine as builder
1+
ARG NGINX_FROM_IMAGE=nginx:mainline-alpine
2+
FROM ${NGINX_FROM_IMAGE} as builder
33

44
ARG ENABLED_MODULES
55

@@ -61,7 +61,7 @@ RUN set -ex \
6161
done \
6262
&& echo "BUILT_MODULES=\"$BUILT_MODULES\"" > /tmp/packages/modules.env
6363

64-
FROM nginx:${NGINX_VERSION_FROM}-alpine
64+
FROM ${NGINX_FROM_IMAGE}
6565
COPY --from=builder /tmp/packages /tmp/packages
6666
RUN set -ex \
6767
&& . /tmp/packages/modules.env \

0 commit comments

Comments
 (0)