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

Updated mainline nginx to 1.25.3 and njs to 0.8.2.

parent 4b0d808b
Branches
Tags 1.25.3
No related merge requests found
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM nginx:1.25.2-alpine FROM nginx:1.25.3-alpine
RUN set -x \ RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \ && apkArch="$(cat /etc/apk/arch)" \
...@@ -55,7 +55,7 @@ RUN set -x \ ...@@ -55,7 +55,7 @@ RUN set -x \
export HOME=${tempDir} \ export HOME=${tempDir} \
&& cd ${tempDir} \ && cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& PKGOSSCHECKSUM=\"64d3f504b246df1997d8442b12303944d2f51e09b35443b23da479af7790b9f84cf2ddf8ba108bdd712f92466f9a8e107b865a488f0898b87d39059f9f7ff56c *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ && PKGOSSCHECKSUM=\"00b217979265cc9d66c991c9c89427558936dbaa568d175ca45780589171d94f1866217be09a83438d95494cf38baaa6788320f6d8d23f2fb29c03117391ff88 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \ echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \ else \
......
...@@ -7,7 +7,7 @@ FROM alpine:3.18 ...@@ -7,7 +7,7 @@ FROM alpine:3.18
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.25.2 ENV NGINX_VERSION 1.25.3
ENV PKG_RELEASE 1 ENV PKG_RELEASE 1
RUN set -x \ RUN set -x \
...@@ -57,7 +57,7 @@ RUN set -x \ ...@@ -57,7 +57,7 @@ RUN set -x \
export HOME=${tempDir} \ export HOME=${tempDir} \
&& cd ${tempDir} \ && cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& PKGOSSCHECKSUM=\"64d3f504b246df1997d8442b12303944d2f51e09b35443b23da479af7790b9f84cf2ddf8ba108bdd712f92466f9a8e107b865a488f0898b87d39059f9f7ff56c *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ && PKGOSSCHECKSUM=\"00b217979265cc9d66c991c9c89427558936dbaa568d175ca45780589171d94f1866217be09a83438d95494cf38baaa6788320f6d8d23f2fb29c03117391ff88 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \ echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \ else \
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
# #
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM nginx:1.25.2-alpine-slim FROM nginx:1.25.3-alpine-slim
ENV NJS_VERSION 0.8.0 ENV NJS_VERSION 0.8.2
RUN set -x \ RUN set -x \
&& apkArch="$(cat /etc/apk/arch)" \ && apkArch="$(cat /etc/apk/arch)" \
...@@ -59,7 +59,7 @@ RUN set -x \ ...@@ -59,7 +59,7 @@ RUN set -x \
export HOME=${tempDir} \ export HOME=${tempDir} \
&& cd ${tempDir} \ && cd ${tempDir} \
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \ && curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
&& PKGOSSCHECKSUM=\"64d3f504b246df1997d8442b12303944d2f51e09b35443b23da479af7790b9f84cf2ddf8ba108bdd712f92466f9a8e107b865a488f0898b87d39059f9f7ff56c *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \ && PKGOSSCHECKSUM=\"00b217979265cc9d66c991c9c89427558936dbaa568d175ca45780589171d94f1866217be09a83438d95494cf38baaa6788320f6d8d23f2fb29c03117391ff88 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \ && if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
echo \"pkg-oss tarball checksum verification succeeded!\"; \ echo \"pkg-oss tarball checksum verification succeeded!\"; \
else \ else \
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM nginx:1.25.2 FROM nginx:1.25.3
RUN set -x \ RUN set -x \
&& apt-get update \ && apt-get update \
......
...@@ -7,8 +7,8 @@ FROM debian:bookworm-slim ...@@ -7,8 +7,8 @@ FROM debian:bookworm-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.25.2 ENV NGINX_VERSION 1.25.3
ENV NJS_VERSION 0.8.0 ENV NJS_VERSION 0.8.2
ENV PKG_RELEASE 1~bookworm ENV PKG_RELEASE 1~bookworm
RUN set -x \ RUN set -x \
......
...@@ -12,13 +12,13 @@ declare branches=( ...@@ -12,13 +12,13 @@ declare branches=(
# Current nginx versions # Current nginx versions
# Remember to update pkgosschecksum when changing this. # Remember to update pkgosschecksum when changing this.
declare -A nginx=( declare -A nginx=(
[mainline]='1.25.2' [mainline]='1.25.3'
[stable]='1.24.0' [stable]='1.24.0'
) )
# Current njs versions # Current njs versions
declare -A njs=( declare -A njs=(
[mainline]='0.8.0' [mainline]='0.8.2'
[stable]='0.8.0' [stable]='0.8.0'
) )
...@@ -52,7 +52,7 @@ declare -A rev=( ...@@ -52,7 +52,7 @@ declare -A rev=(
# revision/tag in the previous block # revision/tag in the previous block
# Used in alpine builds for architectures not packaged by nginx.org # Used in alpine builds for architectures not packaged by nginx.org
declare -A pkgosschecksum=( declare -A pkgosschecksum=(
[mainline]='64d3f504b246df1997d8442b12303944d2f51e09b35443b23da479af7790b9f84cf2ddf8ba108bdd712f92466f9a8e107b865a488f0898b87d39059f9f7ff56c' [mainline]='00b217979265cc9d66c991c9c89427558936dbaa568d175ca45780589171d94f1866217be09a83438d95494cf38baaa6788320f6d8d23f2fb29c03117391ff88'
[stable]='4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b' [stable]='4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b'
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment