Skip to content
Snippets Groups Projects
Commit f3d86e99 authored by Konstantin Pavlov's avatar Konstantin Pavlov
Browse files

Updated NGINX to 1.23.1, NJS to 0.7.6

parent 3581b670
Branches
Tags 1.23.1
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 30 additions and 30 deletions
mainline/alpine-perl/Dockerfile
+ 3
− 3
View file @ f3d86e99
......@@ -7,8 +7,8 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.23.0
ENV NJS_VERSION 0.7.5
ENV NGINX_VERSION 1.23.1
ENV NJS_VERSION 0.7.6
ENV PKG_RELEASE 1
RUN set -x \
......@@ -68,7 +68,7 @@ RUN set -x \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& PKGOSSCHECKSUM=\"678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
......
mainline/alpine/Dockerfile
+ 3
− 3
View file @ f3d86e99
......@@ -7,8 +7,8 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.23.0
ENV NJS_VERSION 0.7.5
ENV NGINX_VERSION 1.23.1
ENV NJS_VERSION 0.7.6
ENV PKG_RELEASE 1
RUN set -x \
......@@ -67,7 +67,7 @@ RUN set -x \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& PKGOSSCHECKSUM=\"678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& PKGOSSCHECKSUM=\"513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
......
mainline/debian-perl/Dockerfile
+ 2
− 2
View file @ f3d86e99
......@@ -7,8 +7,8 @@ FROM debian:bullseye-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.23.0
ENV NJS_VERSION 0.7.5
ENV NGINX_VERSION 1.23.1
ENV NJS_VERSION 0.7.6
ENV PKG_RELEASE 1~bullseye
RUN set -x \
......
mainline/debian/Dockerfile
+ 2
− 2
View file @ f3d86e99
......@@ -7,8 +7,8 @@ FROM debian:bullseye-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.23.0
ENV NJS_VERSION 0.7.5
ENV NGINX_VERSION 1.23.1
ENV NJS_VERSION 0.7.6
ENV PKG_RELEASE 1~bullseye
RUN set -x \
......
stable/alpine-perl/Dockerfile
+ 6
− 6
View file @ f3d86e99
......@@ -8,7 +8,7 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.22.0
ENV NJS_VERSION 0.7.5
ENV NJS_VERSION 0.7.6
ENV PKG_RELEASE 1
RUN set -x \
......@@ -67,16 +67,16 @@ RUN set -x \
&& su nobody -s /bin/sh -c " \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/714.tar.gz \
&& PKGOSSCHECKSUM=\"f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e *714.tar.gz\" \
&& if [ \"\$(openssl sha512 -r 714.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/725.tar.gz \
&& PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
&& if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
&& tar xzvf 714.tar.gz \
&& cd pkg-oss-714 \
&& tar xzvf 725.tar.gz \
&& cd pkg-oss-725 \
&& cd alpine \
&& make all \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
......
stable/alpine/Dockerfile
+ 6
− 6
View file @ f3d86e99
......@@ -8,7 +8,7 @@ FROM alpine:3.16
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.22.0
ENV NJS_VERSION 0.7.5
ENV NJS_VERSION 0.7.6
ENV PKG_RELEASE 1
RUN set -x \
......@@ -66,16 +66,16 @@ RUN set -x \
&& su nobody -s /bin/sh -c " \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/714.tar.gz \
&& PKGOSSCHECKSUM=\"f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e *714.tar.gz\" \
&& if [ \"\$(openssl sha512 -r 714.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/725.tar.gz \
&& PKGOSSCHECKSUM=\"a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3 *725.tar.gz\" \
&& if [ \"\$(openssl sha512 -r 725.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \
echo \"pkg-oss tarball checksum verification failed!\"; \
exit 1; \
fi \
&& tar xzvf 714.tar.gz \
&& cd pkg-oss-714 \
&& tar xzvf 725.tar.gz \
&& cd pkg-oss-725 \
&& cd alpine \
&& make all \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
......
stable/debian-perl/Dockerfile
+ 1
− 1
View file @ f3d86e99
......@@ -8,7 +8,7 @@ FROM debian:bullseye-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.22.0
ENV NJS_VERSION 0.7.5
ENV NJS_VERSION 0.7.6
ENV PKG_RELEASE 1~bullseye
RUN set -x \
......
stable/debian/Dockerfile
+ 1
− 1
View file @ f3d86e99
......@@ -8,7 +8,7 @@ FROM debian:bullseye-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.22.0
ENV NJS_VERSION 0.7.5
ENV NJS_VERSION 0.7.6
ENV PKG_RELEASE 1~bullseye
RUN set -x \
......
update.sh
+ 6
− 6
View file @ f3d86e99
......@@ -12,14 +12,14 @@ declare branches=(
# Current nginx versions
# Remember to update pkgosschecksum when changing this.
declare -A nginx=(
[mainline]='1.23.0'
[mainline]='1.23.1'
[stable]='1.22.0'
)
# Current njs versions
declare -A njs=(
[mainline]='0.7.5'
[stable]='0.7.5'
[mainline]='0.7.6'
[stable]='0.7.6'
)
# Current package patchlevel version
......@@ -45,15 +45,15 @@ declare -A alpine=(
# Remember to update pkgosschecksum when changing this.
declare -A rev=(
[mainline]='${NGINX_VERSION}-${PKG_RELEASE}'
[stable]='714'
[stable]='725'
)
# Holds SHA512 checksum for the pkg-oss tarball produced by source code
# revision/tag in the previous block
# Used in alpine builds for architectures not packaged by nginx.org
declare -A pkgosschecksum=(
[mainline]='678b1e9ab34777f1a1a1a8717aff0dfa08cc187cf2cf140c084d23205f3ba3af97805e72ebbed49dd7bfcb23bbeca982b150fff5c2a6c96f161ed9085101f1a4'
[stable]='f457d5988c1f2663e04c5cdad71874c25e94754277dd9da5d73c1d37c32bdaf288b3b20d8b5d070ffb33aab363eaf4a7abbcf95fcfd72b0729a1c1908c37e30e'
[mainline]='513952f1e0432e667a8e3afef791a2daa036911f35573c849712747f10418f3f5b8712faf75fcb87f91bfaf593622b1e1c4f38ad9fef830f4cae141357206ecd'
[stable]='a6c56bb7e98be77337affe349e1316a71ddad7a732dc3b34294a794b3e740d68385022f0de72d08c090156f194580a92dcb8b5e2aa1c9c29b5a8484a6431e9b3'
)
get_packages() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment