mainline: get rid of duplication in variables versions

Author: thresheek

mainline/alpine-perl/Dockerfile

@@ -3,7 +3,7 @@ FROM alpine:3.9
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
 ENV NGINX_VERSION 1.15.12
-ENV NJS_VERSION   1.15.12.0.3.1
+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) \

mainline/alpine/Dockerfile

@@ -3,7 +3,7 @@ FROM alpine:3.9
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
 ENV NGINX_VERSION 1.15.12
-ENV NJS_VERSION   1.15.12.0.3.1
+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) \

mainline/stretch-perl/Dockerfile

@@ -2,8 +2,9 @@ FROM debian:stretch-slim
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION 1.15.12-1~stretch
-ENV NJS_VERSION   1.15.12.0.3.1-1~stretch
+ENV NGINX_VERSION   1.15.12
+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) \

mainline/stretch/Dockerfile

@@ -2,8 +2,9 @@ FROM debian:stretch-slim
 
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
-ENV NGINX_VERSION 1.15.12-1~stretch
-ENV NJS_VERSION   1.15.12.0.3.1-1~stretch
+ENV NGINX_VERSION   1.15.12
+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) \