Updated nginx to 1.20.1 and 1.21.0

thresheek · thresheek · commit f3fe494531f9 · 2021-05-25T17:18:09.000+03:00
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -3,7 +3,7 @@ set -eu
 
 declare -A aliases
 aliases=(
-	[mainline]='1 1.19 latest'
+	[mainline]='1 1.21 latest'
 	[stable]='1.20'
 )
 
diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile
@@ -7,7 +7,7 @@ FROM alpine:3.13
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.19.10
+ENV NGINX_VERSION 1.21.0
 ENV NJS_VERSION   0.5.3
 ENV PKG_RELEASE   1
 
@@ -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" \
diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile
@@ -7,7 +7,7 @@ FROM alpine:3.13
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.19.10
+ENV NGINX_VERSION 1.21.0
 ENV NJS_VERSION   0.5.3
 ENV PKG_RELEASE   1
 
@@ -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" \
diff --git a/mainline/debian-perl/Dockerfile b/mainline/debian-perl/Dockerfile
@@ -7,7 +7,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION   1.19.10
+ENV NGINX_VERSION   1.21.0
 ENV NJS_VERSION     0.5.3
 ENV PKG_RELEASE     1~buster
 
diff --git a/mainline/debian/Dockerfile b/mainline/debian/Dockerfile
@@ -7,7 +7,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION   1.19.10
+ENV NGINX_VERSION   1.21.0
 ENV NJS_VERSION     0.5.3
 ENV PKG_RELEASE     1~buster
 
diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile
@@ -7,7 +7,7 @@ FROM alpine:3.13
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.20.0
+ENV NGINX_VERSION 1.20.1
 ENV NJS_VERSION   0.5.3
 ENV PKG_RELEASE   1
 
diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile
@@ -7,7 +7,7 @@ FROM alpine:3.13
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.20.0
+ENV NGINX_VERSION 1.20.1
 ENV NJS_VERSION   0.5.3
 ENV PKG_RELEASE   1
 
diff --git a/stable/debian-perl/Dockerfile b/stable/debian-perl/Dockerfile
@@ -7,7 +7,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION   1.20.0
+ENV NGINX_VERSION   1.20.1
 ENV NJS_VERSION     0.5.3
 ENV PKG_RELEASE     1~buster
 
diff --git a/stable/debian/Dockerfile b/stable/debian/Dockerfile
@@ -7,7 +7,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION   1.20.0
+ENV NGINX_VERSION   1.20.1
 ENV NJS_VERSION     0.5.3
 ENV PKG_RELEASE     1~buster
 
diff --git a/sync-awsecr.sh b/sync-awsecr.sh
@@ -6,7 +6,7 @@ registry="public.ecr.aws/z9d2n7e1"
 
 declare -A aliases
 aliases=(
-	[mainline]='1 1.19 latest'
+	[mainline]='1 1.21 latest'
 	[stable]='1.20'
 )
 
diff --git a/update.sh b/update.sh
@@ -10,8 +10,8 @@ declare branches=(
 )
 
 declare -A nginx=(
-    [mainline]='1.19.10'
-    [stable]='1.20.0'
+    [mainline]='1.21.0'
+    [stable]='1.20.1'
 )
 
 defaultnjs='0.5.3'

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ set -eu`
`3`	`3`
`4`	`4`	`declare -A aliases`
`5`	`5`	`aliases=(`
`6`		`- [mainline]='1 1.19 latest'`
	`6`	`+ [mainline]='1 1.21 latest'`
`7`	`7`	`[stable]='1.20'`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ registry="public.ecr.aws/z9d2n7e1"`
`6`	`6`
`7`	`7`	`declare -A aliases`
`8`	`8`	`aliases=(`
`9`		`- [mainline]='1 1.19 latest'`
	`9`	`+ [mainline]='1 1.21 latest'`
`10`	`10`	`[stable]='1.20'`
`11`	`11`	`)`
`12`	`12`