Skip to content
This repository was archived by the owner on Jan 11, 2025. It is now read-only.

Commit 52dba08

Browse files
fabiocicerchiafabiocicerchia
committedOct 29, 2020
fix missing files in /docker-entrypoint.d
·
v1.20210820.231543v1.20201031.072033
1 parent 2aa2486 commit 52dba08

File tree

14 files changed

+65
-40
lines changed

14 files changed

+65
-40
lines changed
 

‎bin/docker-build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function build() {
3030

3131
SUFFIX=""
3232
if [ "$EXTENDED" -eq "0" ]; then
33-
SUFFIX="-minimal"
33+
SUFFIX="${SUFFIX}-minimal"
3434
fi
3535

3636
TAGS=""

‎bin/generate-supported-versions.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ FEDORA=($(sort -Vu <<<"${FEDORA[*]}"))
8383
UBUNTU=($(sort -Vu <<<"${UBUNTU[*]}"))
8484
unset IFS
8585

86-
echo "NGINX=(\"${NGINX[*]}\")" | sed 's/ /" "/g' > supported_versions
86+
echo -n "" > supported_versions
87+
echo "NGINX=(\"${NGINX[*]}\")" | sed 's/ /" "/g' >> supported_versions
8788
echo "ALPINE=(\"${ALPINE[*]}\")" | sed 's/ /" "/g' >> supported_versions
8889
echo "AMAZONLINUX=(\"${AMAZONLINUX[*]}\")" | sed 's/ /" "/g' >> supported_versions
8990
echo "CENTOS=(\"${CENTOS[*]}\")" | sed 's/ /" "/g' >> supported_versions

‎nginx/1.19.3/alpine/3.12.1/Dockerfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,6 @@ COPY --from=builder /usr/local/share/lua /usr/local/share/lua
271271
COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
272272
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
273273
COPY --from=builder /var/cache/nginx /var/cache/nginx
274-
COPY tpl/docker-entrypoint.sh /
275-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
276-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
277274

278275
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
279276

@@ -309,7 +306,12 @@ RUN set -eux \
309306
&& ln -sf /dev/stderr /var/log/nginx/error.log \
310307
# create nginx user/group first, to be consistent throughout docker variants
311308
&& addgroup -g 101 -S nginx \
312-
&& adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx
309+
&& adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx \
310+
&& mkdir /docker-entrypoint.d
311+
312+
COPY tpl/docker-entrypoint.sh /
313+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
314+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
313315

314316
# smoke test
315317
# ##############################################################################

‎nginx/1.19.3/amazonlinux/2.0.20200722.0/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
264264
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
265265
COPY --from=builder /var/cache/nginx /var/cache/nginx
266266
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
267-
COPY tpl/docker-entrypoint.sh /
268-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
269-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
270267

271268
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
272269

@@ -288,13 +285,18 @@ RUN set -eux \
288285
# create nginx user/group first, to be consistent throughout docker variants
289286
&& groupadd --system --gid 101 nginx \
290287
&& useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
288+
&& mkdir /docker-entrypoint.d \
291289
# Cleanup
292290
# ##############################################################################
293291
&& yum remove -y \
294292
shadow-utils \
295293
&& yum clean all \
296294
&& rm -rf /var/cache/yum
297295

296+
COPY tpl/docker-entrypoint.sh /
297+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
298+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
299+
298300
# smoke test
299301
# ##############################################################################
300302
RUN envsubst -V \

‎nginx/1.19.3/centos/8/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
265265
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
266266
COPY --from=builder /var/cache/nginx /var/cache/nginx
267267
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
268-
COPY tpl/docker-entrypoint.sh /
269-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
270-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
271268

272269
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
273270

@@ -289,11 +286,16 @@ RUN set -eux \
289286
# create nginx user/group first, to be consistent throughout docker variants
290287
&& groupadd --system --gid 101 nginx \
291288
&& useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
289+
&& mkdir /docker-entrypoint.d \
292290
# Cleanup
293291
# ##############################################################################
294292
&& yum clean all \
295293
&& rm -rf /var/cache/yum
296294

295+
COPY tpl/docker-entrypoint.sh /
296+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
297+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
298+
297299
# smoke test
298300
# ##############################################################################
299301
RUN envsubst -V \

‎nginx/1.19.3/debian/10.6/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
267267
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
268268
COPY --from=builder /var/cache/nginx /var/cache/nginx
269269
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
270-
COPY tpl/docker-entrypoint.sh /
271-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
272-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
273270

274271
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
275272

@@ -290,11 +287,16 @@ RUN set -eux \
290287
# create nginx user/group first, to be consistent throughout docker variants
291288
&& addgroup --system --gid 101 nginx \
292289
&& adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
290+
&& mkdir /docker-entrypoint.d \
293291
# Cleanup
294292
# ##############################################################################
295293
&& apt-get autoremove -y \
296294
&& rm -rf /var/lib/apt/lists/*
297295

296+
COPY tpl/docker-entrypoint.sh /
297+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
298+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
299+
298300
# smoke test
299301
# ##############################################################################
300302
RUN envsubst -V \

‎nginx/1.19.3/fedora/33/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
266266
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
267267
COPY --from=builder /var/cache/nginx /var/cache/nginx
268268
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
269-
COPY tpl/docker-entrypoint.sh /
270-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
271-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
272269

273270
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
274271

@@ -290,11 +287,16 @@ RUN set -eux \
290287
# create nginx user/group first, to be consistent throughout docker variants
291288
&& groupadd --system --gid 101 nginx \
292289
&& useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
290+
&& mkdir /docker-entrypoint.d \
293291
# Cleanup
294292
# ##############################################################################
295293
&& dnf clean all \
296294
&& rm -rf /var/cache/dnf
297295

296+
COPY tpl/docker-entrypoint.sh /
297+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
298+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
299+
298300
# smoke test
299301
# ##############################################################################
300302
RUN envsubst -V \

‎nginx/1.19.3/ubuntu/20.04/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
267267
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
268268
COPY --from=builder /var/cache/nginx /var/cache/nginx
269269
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
270-
COPY tpl/docker-entrypoint.sh /
271-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
272-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
273270

274271
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
275272

@@ -290,11 +287,16 @@ RUN set -eux \
290287
# create nginx user/group first, to be consistent throughout docker variants
291288
&& addgroup --system --gid 101 nginx \
292289
&& adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
290+
&& mkdir /docker-entrypoint.d \
293291
# Cleanup
294292
# ##############################################################################
295293
&& apt-get autoremove -y \
296294
&& rm -rf /var/lib/apt/lists/*
297295

296+
COPY tpl/docker-entrypoint.sh /
297+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
298+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
299+
298300
# smoke test
299301
# ##############################################################################
300302
RUN envsubst -V \

‎tpl/Dockerfile.alpine

+6-4
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,6 @@ COPY --from=builder /usr/local/share/lua /usr/local/share/lua
271271
COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
272272
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
273273
COPY --from=builder /var/cache/nginx /var/cache/nginx
274-
COPY tpl/docker-entrypoint.sh /
275-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
276-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
277274

278275
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
279276

@@ -309,7 +306,12 @@ RUN set -eux \
309306
&& ln -sf /dev/stderr /var/log/nginx/error.log \
310307
# create nginx user/group first, to be consistent throughout docker variants
311308
&& addgroup -g 101 -S nginx \
312-
&& adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx
309+
&& adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx \
310+
&& mkdir /docker-entrypoint.d
311+
312+
COPY tpl/docker-entrypoint.sh /
313+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
314+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
313315

314316
# smoke test
315317
# ##############################################################################

‎tpl/Dockerfile.amazonlinux

+5-3
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
264264
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
265265
COPY --from=builder /var/cache/nginx /var/cache/nginx
266266
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
267-
COPY tpl/docker-entrypoint.sh /
268-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
269-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
270267

271268
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
272269

@@ -288,13 +285,18 @@ RUN set -eux \
288285
# create nginx user/group first, to be consistent throughout docker variants
289286
&& groupadd --system --gid 101 nginx \
290287
&& useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
288+
&& mkdir /docker-entrypoint.d \
291289
# Cleanup
292290
# ##############################################################################
293291
&& yum remove -y \
294292
shadow-utils \
295293
&& yum clean all \
296294
&& rm -rf /var/cache/yum
297295

296+
COPY tpl/docker-entrypoint.sh /
297+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
298+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
299+
298300
# smoke test
299301
# ##############################################################################
300302
RUN envsubst -V \

‎tpl/Dockerfile.centos

+5-3
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
265265
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
266266
COPY --from=builder /var/cache/nginx /var/cache/nginx
267267
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
268-
COPY tpl/docker-entrypoint.sh /
269-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
270-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
271268

272269
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
273270

@@ -289,11 +286,16 @@ RUN set -eux \
289286
# create nginx user/group first, to be consistent throughout docker variants
290287
&& groupadd --system --gid 101 nginx \
291288
&& useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
289+
&& mkdir /docker-entrypoint.d \
292290
# Cleanup
293291
# ##############################################################################
294292
&& yum clean all \
295293
&& rm -rf /var/cache/yum
296294

295+
COPY tpl/docker-entrypoint.sh /
296+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
297+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
298+
297299
# smoke test
298300
# ##############################################################################
299301
RUN envsubst -V \

‎tpl/Dockerfile.debian

+5-3
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
267267
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
268268
COPY --from=builder /var/cache/nginx /var/cache/nginx
269269
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
270-
COPY tpl/docker-entrypoint.sh /
271-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
272-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
273270

274271
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
275272

@@ -290,11 +287,16 @@ RUN set -eux \
290287
# create nginx user/group first, to be consistent throughout docker variants
291288
&& addgroup --system --gid 101 nginx \
292289
&& adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
290+
&& mkdir /docker-entrypoint.d \
293291
# Cleanup
294292
# ##############################################################################
295293
&& apt-get autoremove -y \
296294
&& rm -rf /var/lib/apt/lists/*
297295

296+
COPY tpl/docker-entrypoint.sh /
297+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
298+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
299+
298300
# smoke test
299301
# ##############################################################################
300302
RUN envsubst -V \

‎tpl/Dockerfile.fedora

+5-3
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
266266
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
267267
COPY --from=builder /var/cache/nginx /var/cache/nginx
268268
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
269-
COPY tpl/docker-entrypoint.sh /
270-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
271-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
272269

273270
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
274271

@@ -290,11 +287,16 @@ RUN set -eux \
290287
# create nginx user/group first, to be consistent throughout docker variants
291288
&& groupadd --system --gid 101 nginx \
292289
&& useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
290+
&& mkdir /docker-entrypoint.d \
293291
# Cleanup
294292
# ##############################################################################
295293
&& dnf clean all \
296294
&& rm -rf /var/cache/dnf
297295

296+
COPY tpl/docker-entrypoint.sh /
297+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
298+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
299+
298300
# smoke test
299301
# ##############################################################################
300302
RUN envsubst -V \

‎tpl/Dockerfile.ubuntu

+5-3
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
267267
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
268268
COPY --from=builder /var/cache/nginx /var/cache/nginx
269269
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
270-
COPY tpl/docker-entrypoint.sh /
271-
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d
272-
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d
273270

274271
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
275272

@@ -290,11 +287,16 @@ RUN set -eux \
290287
# create nginx user/group first, to be consistent throughout docker variants
291288
&& addgroup --system --gid 101 nginx \
292289
&& adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
290+
&& mkdir /docker-entrypoint.d \
293291
# Cleanup
294292
# ##############################################################################
295293
&& apt-get autoremove -y \
296294
&& rm -rf /var/lib/apt/lists/*
297295

296+
COPY tpl/docker-entrypoint.sh /
297+
COPY tpl/10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/
298+
COPY tpl/20-envsubst-on-templates.sh /docker-entrypoint.d/
299+
298300
# smoke test
299301
# ##############################################################################
300302
RUN envsubst -V \

0 commit comments

Comments
 (0)
This repository has been archived.