Updated stable nginx to 1.20.0

While at it, bumped alpine base image to 3.13 and njs to 0.5.3

Author: thresheek

stable/alpine-perl/Dockerfile

@@ -3,13 +3,13 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM alpine:3.11
+FROM alpine:3.13
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION 1.18.0
-ENV NJS_VERSION   0.4.4
-ENV PKG_RELEASE   2
+ENV NGINX_VERSION 1.20.0
+ENV NJS_VERSION   0.5.3
+ENV PKG_RELEASE   1
 
 RUN set -x \
 # create nginx user/group first, to be consistent throughout docker variants
@@ -25,7 +25,7 @@ RUN set -x \
         nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${PKG_RELEASE} \
     " \
     && case "$apkArch" in \
-        x86_64) \
+        x86_64|aarch64) \
 # arches officially built by upstream
             set -x \
             && KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \

stable/alpine/Dockerfile

@@ -3,13 +3,13 @@
 #
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
-FROM alpine:3.11
+FROM alpine:3.13
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION 1.18.0
-ENV NJS_VERSION   0.4.4
-ENV PKG_RELEASE   2
+ENV NGINX_VERSION 1.20.0
+ENV NJS_VERSION   0.5.3
+ENV PKG_RELEASE   1
 
 RUN set -x \
 # create nginx user/group first, to be consistent throughout docker variants
@@ -24,7 +24,7 @@ RUN set -x \
         nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${PKG_RELEASE} \
     " \
     && case "$apkArch" in \
-        x86_64) \
+        x86_64|aarch64) \
 # arches officially built by upstream
             set -x \
             && KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \

stable/debian-perl/Dockerfile

@@ -7,9 +7,9 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION   1.18.0
-ENV NJS_VERSION     0.4.4
-ENV PKG_RELEASE     2~buster
+ENV NGINX_VERSION   1.20.0
+ENV NJS_VERSION     0.5.3
+ENV PKG_RELEASE     1~buster
 
 RUN set -x \
 # create nginx user/group first, to be consistent throughout docker variants
@@ -38,7 +38,7 @@ RUN set -x \
         nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
         nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
         nginx-module-perl=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-${PKG_RELEASE} \
+        nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${PKG_RELEASE} \
     " \
     && case "$dpkgArch" in \
         amd64|i386|arm64) \

stable/debian/Dockerfile

@@ -7,9 +7,9 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION   1.18.0
-ENV NJS_VERSION     0.4.4
-ENV PKG_RELEASE     2~buster
+ENV NGINX_VERSION   1.20.0
+ENV NJS_VERSION     0.5.3
+ENV PKG_RELEASE     1~buster
 
 RUN set -x \
 # create nginx user/group first, to be consistent throughout docker variants
@@ -37,7 +37,7 @@ RUN set -x \
         nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
         nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
         nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
-        nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-${PKG_RELEASE} \
+        nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${PKG_RELEASE} \
     " \
     && case "$dpkgArch" in \
         amd64|i386|arm64) \

update.sh

@@ -11,17 +11,17 @@ declare branches=(
 
 declare -A nginx=(
     [mainline]='1.19.10'
-    [stable]='1.18.0'
+    [stable]='1.20.0'
 )
 
 defaultnjs='0.5.3'
 declare -A njs=(
-    [stable]='0.4.4'
+#    [stable]='0.4.4'
 )
 
 defaultpkg='1'
 declare -A pkg=(
-    [stable]=2
+#    [stable]=2
 )
 
 defaultdebian='buster'
@@ -31,7 +31,7 @@ declare -A debian=(
 
 defaultalpine='3.13'
 declare -A alpine=(
-    [stable]='3.11'
+#    [stable]='3.11'
 )
 
 # When we bump njs version in a stable release we don't move the tag in the
@@ -54,9 +54,6 @@ get_packages() {
             r="r"
             sep="."
             ;;
-        debian*:stable)
-            sep="."
-            ;;
         debian*:*)
             sep="+"
          ;;