Skip to content

Commit f958fba

Browse files
committed
Updated nginx to 1.21.1 and njs to 0.6.1 on mainline builds.
While at it, move mainline builds to alpine 3.14.
1 parent 4fb9623 commit f958fba

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

mainline/alpine-perl/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM alpine:3.13
6+
FROM alpine:3.14
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.21.0
11-
ENV NJS_VERSION 0.5.3
10+
ENV NGINX_VERSION 1.21.1
11+
ENV NJS_VERSION 0.6.1
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \

mainline/alpine/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
FROM alpine:3.13
6+
FROM alpine:3.14
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.21.0
11-
ENV NJS_VERSION 0.5.3
10+
ENV NGINX_VERSION 1.21.1
11+
ENV NJS_VERSION 0.6.1
1212
ENV PKG_RELEASE 1
1313

1414
RUN set -x \

mainline/debian-perl/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM debian:buster-slim
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.21.0
11-
ENV NJS_VERSION 0.5.3
10+
ENV NGINX_VERSION 1.21.1
11+
ENV NJS_VERSION 0.6.1
1212
ENV PKG_RELEASE 1~buster
1313

1414
RUN set -x \

mainline/debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ FROM debian:buster-slim
77

88
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
99

10-
ENV NGINX_VERSION 1.21.0
11-
ENV NJS_VERSION 0.5.3
10+
ENV NGINX_VERSION 1.21.1
11+
ENV NJS_VERSION 0.6.1
1212
ENV PKG_RELEASE 1~buster
1313

1414
RUN set -x \

update.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ declare branches=(
1010
)
1111

1212
declare -A nginx=(
13-
[mainline]='1.21.0'
13+
[mainline]='1.21.1'
1414
[stable]='1.20.1'
1515
)
1616

17-
defaultnjs='0.5.3'
17+
defaultnjs='0.6.1'
1818
declare -A njs=(
19-
# [stable]='0.4.4'
19+
[stable]='0.5.3'
2020
)
2121

2222
defaultpkg='1'
@@ -29,9 +29,9 @@ declare -A debian=(
2929
#[stable]='stretch'
3030
)
3131

32-
defaultalpine='3.13'
32+
defaultalpine='3.14'
3333
declare -A alpine=(
34-
# [stable]='3.11'
34+
[stable]='3.13'
3535
)
3636

3737
# When we bump njs version in a stable release we don't move the tag in the

0 commit comments

Comments
 (0)