Updated stable nginx to 1.16.0

While at it, merge mainline versioning changes.
nginxinc · Apr 23, 2019 · 9a052e0 · 9a052e0
1 parent 42b9a87
commit 9a052e0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 28 deletions.
diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile
@@ -2,8 +2,8 @@ FROM alpine:3.9
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.14.2
-ENV NJS_VERSION   1.14.2.0.2.7
+ENV NGINX_VERSION 1.16.0
+ENV NJS_VERSION   0.3.1
 ENV PKG_RELEASE 1
 
 RUN set -x \
@@ -14,7 +14,7 @@ RUN set -x \
         nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
         nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
         nginx-module-perl=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-njs=${NJS_VERSION}-r${PKG_RELEASE} \
+        nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${PKG_RELEASE} \
     " \
     && case "$apkArch" in \
         x86_64) \
@@ -66,9 +66,7 @@ RUN set -x \
                 && cd ${tempDir} \
                 && hg clone https://hg.nginx.org/pkg-oss \
                 && cd pkg-oss \
-# fixme: needs to check out a tag on the next 1.14 release
-                && hg up stable-1.14 \
-                && echo hg up ${NGINX_VERSION}-${PKG_RELEASE} \
+                && hg up ${NGINX_VERSION}-${PKG_RELEASE} \
                 && cd alpine \
                 && make all \
                 && apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile
@@ -2,8 +2,8 @@ FROM alpine:3.9
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.14.2
-ENV NJS_VERSION   1.14.2.0.2.7
+ENV NGINX_VERSION 1.16.0
+ENV NJS_VERSION   0.3.1
 ENV PKG_RELEASE 1
 
 RUN set -x \
@@ -13,7 +13,7 @@ RUN set -x \
         nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
         nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
         nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
-        nginx-module-njs=${NJS_VERSION}-r${PKG_RELEASE} \
+        nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${PKG_RELEASE} \
     " \
     && case "$apkArch" in \
         x86_64) \
@@ -65,9 +65,7 @@ RUN set -x \
                 && cd ${tempDir} \
                 && hg clone https://hg.nginx.org/pkg-oss \
                 && cd pkg-oss \
-# fixme: needs to check out a tag on the next 1.14 release
-                && hg up stable-1.14 \
-                && echo hg up ${NGINX_VERSION}-${PKG_RELEASE} \
+                && hg up ${NGINX_VERSION}-${PKG_RELEASE} \
                 && cd alpine \
                 && make all \
                 && apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \

diff --git a/stable/stretch-perl/Dockerfile b/stable/stretch-perl/Dockerfile
@@ -2,8 +2,9 @@ FROM debian:stretch-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.14.2-1~stretch
-ENV NJS_VERSION   1.14.2.0.2.6-1~stretch
+ENV NGINX_VERSION   1.16.0
+ENV NJS_VERSION     0.3.1
+ENV PKG_RELEASE     1~stretch
 
 RUN set -x \
 	&& apt-get update \
@@ -23,13 +24,13 @@ RUN set -x \
 	test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
 	apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
 	&& dpkgArch="$(dpkg --print-architecture)" \
-	&& nginxPackages=" \
-		nginx=${NGINX_VERSION} \
-		nginx-module-xslt=${NGINX_VERSION} \
-		nginx-module-geoip=${NGINX_VERSION} \
-		nginx-module-image-filter=${NGINX_VERSION} \
-		nginx-module-perl=${NGINX_VERSION} \
-		nginx-module-njs=${NJS_VERSION} \
+    && nginxPackages=" \
+        nginx=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
+        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} \
 	" \
 	&& case "$dpkgArch" in \
 		amd64|i386) \

diff --git a/stable/stretch/Dockerfile b/stable/stretch/Dockerfile
@@ -2,8 +2,9 @@ FROM debian:stretch-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.14.2-1~stretch
-ENV NJS_VERSION   1.14.2.0.2.6-1~stretch
+ENV NGINX_VERSION   1.16.0
+ENV NJS_VERSION     0.3.1
+ENV PKG_RELEASE     1~stretch
 
 RUN set -x \
 	&& apt-get update \
@@ -24,11 +25,11 @@ RUN set -x \
 	apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
 	&& dpkgArch="$(dpkg --print-architecture)" \
 	&& nginxPackages=" \
-		nginx=${NGINX_VERSION} \
-		nginx-module-xslt=${NGINX_VERSION} \
-		nginx-module-geoip=${NGINX_VERSION} \
-		nginx-module-image-filter=${NGINX_VERSION} \
-		nginx-module-njs=${NJS_VERSION} \
+		nginx=${NGINX_VERSION}-${PKG_RELEASE} \
+		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} \
 	" \
 	&& case "$dpkgArch" in \
 		amd64|i386) \