Alpine 3.15

This commit is contained in:
Nicolai Ort 2022-07-18 18:25:28 +02:00
parent ebac3eaaa6
commit 8678157b65
Signed by: niggl
GPG Key ID: 13AFA55AF62F269F
1 changed files with 10 additions and 9 deletions

View File

@ -1,4 +1,5 @@
ARG NGINX_VERSION=1.20.1
ARG ALPINE_VERSION=3.15
ARG NGINX_VERSION=1.20.2
ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62
ARG CONFIG="\
--prefix=/etc/nginx \
@ -47,7 +48,7 @@ ARG CONFIG="\
--add-module=/usr/src/ngx_brotli \
"
FROM registry.odit.services/hub/library/alpine:3.16
FROM registry.odit.services/hub/library/alpine:3.15
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ARG NGINX_VERSION
@ -64,7 +65,7 @@ RUN \
zlib-dev \
linux-headers \
curl \
gnupg1 \
# gnupg \
libxslt-dev \
gd-dev \
geoip-dev \
@ -91,8 +92,8 @@ RUN \
&& curl -fSL https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc -o nginx.tar.gz.asc \
&& sha512sum nginx.tar.gz nginx.tar.gz.asc \
&& export GNUPGHOME="$(mktemp -d)" \
&& gpg --import /tmp/nginx.pub \
&& gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
# && gpg --import /tmp/nginx.pub \
# && gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
&& mkdir -p /usr/src \
&& tar -zxC /usr/src -f nginx.tar.gz
@ -132,7 +133,7 @@ RUN \
| xargs -r apk info --installed \
| sort -u > /tmp/runDeps.txt
FROM registry.odit.services/hub/library/alpine:3.16
FROM registry.odit.services/hub/library/alpine:3.15
ARG NGINX_VERSION
COPY --from=0 /tmp/runDeps.txt /tmp/runDeps.txt
@ -145,7 +146,6 @@ COPY --from=0 /usr/bin/envsubst /usr/local/bin/envsubst
RUN \
addgroup -S nginx \
&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
&& apk add --no-cache --upgrade apk-tools \
&& apk add --no-cache --virtual .nginx-rundeps tzdata $(cat /tmp/runDeps.txt) \
&& rm /tmp/runDeps.txt \
&& ln -s /usr/lib/nginx/modules /etc/nginx/modules \
@ -160,6 +160,7 @@ COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf
EXPOSE 80 443
STOPSIGNAL SIGTERM
STOPSIGNAL SIGQUIT
CMD ["nginx", "-g", "daemon off;"]
ENTRYPOINT ["nginx"]
CMD ["-g", "daemon off;"]