Skip to content

Commit acb0745

Browse files
committed
Updated nginx
Updated nginx stable to 1.26.0 and moved to Alpine 3.19 / Debian Bookworm. This also adds otel module variant for stable as was previously introduced for mainline. Mainline is also updated to hopefully fix njs 0.8.4+quickjs build on arm32v5. With that, some simplifications and minor fixes to Dockerfiles were merged.
1 parent 7ab59b8 commit acb0745

File tree

1 file changed

+28
-18
lines changed

1 file changed

+28
-18
lines changed

library/nginx

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,74 @@
1-
# this file is generated via https://github.com/nginxinc/docker-nginx/blob/9cb278860bdcea48abc0bc770a29ead3fc9a1fe6/generate-stackbrew-library.sh
1+
# this file is generated via https://github.com/nginxinc/docker-nginx/blob/435f9c2a06cf2d5fd65767d2f0696b9c988b814b/generate-stackbrew-library.sh
22

33
Maintainers: NGINX Docker Maintainers <[email protected]> (@nginxinc)
44
GitRepo: https://github.com/nginxinc/docker-nginx.git
55

66
Tags: 1.25.5, mainline, 1, 1.25, latest, 1.25.5-bookworm, mainline-bookworm, 1-bookworm, 1.25-bookworm, bookworm
77
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
8-
GitCommit: 29d5001c15e7a2c7b34402c35254cc55199f8cc8
8+
GitCommit: 66c0f94b4c764b1a531528e8c242ad94497011f6
99
Directory: mainline/debian
1010

1111
Tags: 1.25.5-perl, mainline-perl, 1-perl, 1.25-perl, perl, 1.25.5-bookworm-perl, mainline-bookworm-perl, 1-bookworm-perl, 1.25-bookworm-perl, bookworm-perl
1212
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
13-
GitCommit: 29d5001c15e7a2c7b34402c35254cc55199f8cc8
13+
GitCommit: 5bf2e65ab9eaa029613e18fc5dfab04693511ed6
1414
Directory: mainline/debian-perl
1515

1616
Tags: 1.25.5-otel, mainline-otel, 1-otel, 1.25-otel, otel, 1.25.5-bookworm-otel, mainline-bookworm-otel, 1-bookworm-otel, 1.25-bookworm-otel, bookworm-otel
1717
Architectures: amd64, arm64v8
18-
GitCommit: 29d5001c15e7a2c7b34402c35254cc55199f8cc8
18+
GitCommit: 5bf2e65ab9eaa029613e18fc5dfab04693511ed6
1919
Directory: mainline/debian-otel
2020

2121
Tags: 1.25.5-alpine, mainline-alpine, 1-alpine, 1.25-alpine, alpine, 1.25.5-alpine3.19, mainline-alpine3.19, 1-alpine3.19, 1.25-alpine3.19, alpine3.19
2222
Architectures: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
23-
GitCommit: 29d5001c15e7a2c7b34402c35254cc55199f8cc8
23+
GitCommit: 3fb7e2e6266d5652dabe275dbfd50bdb3418361e
2424
Directory: mainline/alpine
2525

2626
Tags: 1.25.5-alpine-perl, mainline-alpine-perl, 1-alpine-perl, 1.25-alpine-perl, alpine-perl, 1.25.5-alpine3.19-perl, mainline-alpine3.19-perl, 1-alpine3.19-perl, 1.25-alpine3.19-perl, alpine3.19-perl
2727
Architectures: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
28-
GitCommit: 29d5001c15e7a2c7b34402c35254cc55199f8cc8
28+
GitCommit: 3fb7e2e6266d5652dabe275dbfd50bdb3418361e
2929
Directory: mainline/alpine-perl
3030

3131
Tags: 1.25.5-alpine-slim, mainline-alpine-slim, 1-alpine-slim, 1.25-alpine-slim, alpine-slim, 1.25.5-alpine3.19-slim, mainline-alpine3.19-slim, 1-alpine3.19-slim, 1.25-alpine3.19-slim, alpine3.19-slim
3232
Architectures: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
33-
GitCommit: 29d5001c15e7a2c7b34402c35254cc55199f8cc8
33+
GitCommit: 3fb7e2e6266d5652dabe275dbfd50bdb3418361e
3434
Directory: mainline/alpine-slim
3535

3636
Tags: 1.25.5-alpine-otel, mainline-alpine-otel, 1-alpine-otel, 1.25-alpine-otel, alpine-otel, 1.25.5-alpine3.19-otel, mainline-alpine3.19-otel, 1-alpine3.19-otel, 1.25-alpine3.19-otel, alpine3.19-otel
3737
Architectures: amd64, arm64v8
38-
GitCommit: 29d5001c15e7a2c7b34402c35254cc55199f8cc8
38+
GitCommit: 3fb7e2e6266d5652dabe275dbfd50bdb3418361e
3939
Directory: mainline/alpine-otel
4040

41-
Tags: 1.24.0, stable, 1.24, 1.24.0-bullseye, stable-bullseye, 1.24-bullseye
41+
Tags: 1.26.0, stable, 1.26, 1.26.0-bookworm, stable-bookworm, 1.26-bookworm
4242
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
43-
GitCommit: 1a8d87b69760693a8e33cd8a9e0c2e5f0e8b0e3c
43+
GitCommit: 66c0f94b4c764b1a531528e8c242ad94497011f6
4444
Directory: stable/debian
4545

46-
Tags: 1.24.0-perl, stable-perl, 1.24-perl, 1.24.0-bullseye-perl, stable-bullseye-perl, 1.24-bullseye-perl
46+
Tags: 1.26.0-perl, stable-perl, 1.26-perl, 1.26.0-bookworm-perl, stable-bookworm-perl, 1.26-bookworm-perl
4747
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
48-
GitCommit: 1a8d87b69760693a8e33cd8a9e0c2e5f0e8b0e3c
48+
GitCommit: 5bf2e65ab9eaa029613e18fc5dfab04693511ed6
4949
Directory: stable/debian-perl
5050

51-
Tags: 1.24.0-alpine, stable-alpine, 1.24-alpine, 1.24.0-alpine3.17, stable-alpine3.17, 1.24-alpine3.17
51+
Tags: 1.26.0-otel, stable-otel, 1.26-otel, 1.26.0-bookworm-otel, stable-bookworm-otel, 1.26-bookworm-otel
52+
Architectures: amd64, arm64v8
53+
GitCommit: 5bf2e65ab9eaa029613e18fc5dfab04693511ed6
54+
Directory: stable/debian-otel
55+
56+
Tags: 1.26.0-alpine, stable-alpine, 1.26-alpine, 1.26.0-alpine3.19, stable-alpine3.19, 1.26-alpine3.19
5257
Architectures: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
53-
GitCommit: 1a8d87b69760693a8e33cd8a9e0c2e5f0e8b0e3c
58+
GitCommit: 3fb7e2e6266d5652dabe275dbfd50bdb3418361e
5459
Directory: stable/alpine
5560

56-
Tags: 1.24.0-alpine-perl, stable-alpine-perl, 1.24-alpine-perl, 1.24.0-alpine3.17-perl, stable-alpine3.17-perl, 1.24-alpine3.17-perl
61+
Tags: 1.26.0-alpine-perl, stable-alpine-perl, 1.26-alpine-perl, 1.26.0-alpine3.19-perl, stable-alpine3.19-perl, 1.26-alpine3.19-perl
5762
Architectures: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
58-
GitCommit: 1a8d87b69760693a8e33cd8a9e0c2e5f0e8b0e3c
63+
GitCommit: 3fb7e2e6266d5652dabe275dbfd50bdb3418361e
5964
Directory: stable/alpine-perl
6065

61-
Tags: 1.24.0-alpine-slim, stable-alpine-slim, 1.24-alpine-slim, 1.24.0-alpine3.17-slim, stable-alpine3.17-slim, 1.24-alpine3.17-slim
66+
Tags: 1.26.0-alpine-slim, stable-alpine-slim, 1.26-alpine-slim, 1.26.0-alpine3.19-slim, stable-alpine3.19-slim, 1.26-alpine3.19-slim
6267
Architectures: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
63-
GitCommit: 1a8d87b69760693a8e33cd8a9e0c2e5f0e8b0e3c
68+
GitCommit: ed439d2266cee6304339d50c5fe33d8f87f6eb37
6469
Directory: stable/alpine-slim
70+
71+
Tags: 1.26.0-alpine-otel, stable-alpine-otel, 1.26-alpine-otel, 1.26.0-alpine3.19-otel, stable-alpine3.19-otel, 1.26-alpine3.19-otel
72+
Architectures: amd64, arm64v8
73+
GitCommit: 33588b16913fe91d3a201043b73f3366d15fcce1
74+
Directory: stable/alpine-otel

0 commit comments

Comments
 (0)