Skip to content

Commit 775f3c5

Browse files
pdabelf5pdabelf5
authored
update alpine to latest supported versions for Plus & NAP (#7282)
1 parent 70a5c59 commit 775f3c5

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

‎build/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ ARG PACKAGE_REPO=pkgs.nginx.com
1414
FROM ghcr.io/nginx/dependencies/nginx-ot:nginx-1.27.4@sha256:03f155e36694d5a812b5df19caafd1e7172d5134d77f68d797d51078144d1aa7 AS opentracing-lib
1515
FROM ghcr.io/nginx/dependencies/nginx-ot:nginx-1.27.4-alpine@sha256:2490e516e9ce35a1e188d3200613bba63bef628bfef6e2c9e6a5e00aef9b679a AS alpine-opentracing-lib
1616
FROM ghcr.io/nginx/dependencies/nginx-ubi-ppc64le:nginx-1.27.4@sha256:fff4dde599b89cb22e5cea5d8cfba8c47bcedaa8e6fa549f5fe74a89c733aa2f AS ubi-ppc64le
17-
FROM ghcr.io/nginx/alpine-fips:0.2.4-alpine3.17@sha256:73de48bf4ce75fe74c3b7169e63b28edeecafac8c14cc52509becb8b98f84202 AS alpine-fips-3.17
18-
FROM ghcr.io/nginx/alpine-fips:0.2.4-alpine3.20@sha256:d28eeb2c22f4ef223cd3e424943451a782aa0ba1a96a1dbd20c8d90e8c4341e0 AS alpine-fips-3.20
17+
FROM ghcr.io/nginx/alpine-fips:0.2.4-alpine3.19@sha256:2a7f8451110b588b733e4cb8727a48153057b1debac5c78ef8a539ff63712fa1 AS alpine-fips-3.19
18+
FROM ghcr.io/nginx/alpine-fips:0.2.4-alpine3.21@sha256:5221dec2e33436f2586c743c7aa3ef4626c0ec54184dc3364d101036d4f4a060 AS alpine-fips-3.21
1919
FROM redhat/ubi9-minimal:9.5@sha256:14f14e03d68f7fd5f2b18a13478b6b127c341b346c86b6e0b886ed2b7573b8e0 AS ubi-minimal
2020
FROM golang:1.24-alpine@sha256:2d40d4fc278dad38be0777d5e2a88a2c6dee51b0b29c97a764fc6c6a11ca893c AS golang-builder
2121

@@ -106,7 +106,7 @@ USER 101
106106

107107

108108
############################################# Base image for Alpine with NGINX Plus ##############################################
109-
FROM alpine:3.20@sha256:de4fe7064d8f98419ea6b49190df1abbf43450c1702eeb864fe9ced453c1cc5f AS alpine-plus
109+
FROM alpine:3.21@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099 AS alpine-plus
110110
ARG NGINX_PLUS_VERSION
111111
ARG PACKAGE_REPO
112112

@@ -133,7 +133,7 @@ ARG NGINX_PLUS_VERSION
133133

134134
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
135135

136-
RUN --mount=type=bind,from=alpine-fips-3.20,target=/tmp/fips/ \
136+
RUN --mount=type=bind,from=alpine-fips-3.21,target=/tmp/fips/ \
137137
--mount=type=bind,from=nginx-files,src=tracking.info,target=/tmp/nginx/reporting/tracking.info \
138138
mkdir -p /usr/ssl \
139139
&& cp -av /tmp/fips/usr/lib/ossl-modules/fips.so /usr/lib/ossl-modules/fips.so \
@@ -143,15 +143,15 @@ RUN --mount=type=bind,from=alpine-fips-3.20,target=/tmp/fips/ \
143143

144144

145145
############################################# Base image for Alpine with NGINX Plus, App Protect WAF and FIPS #############################################
146-
FROM alpine:3.17@sha256:8fc3dacfb6d69da8d44e42390de777e48577085db99aa4e4af35f483eb08b989 AS alpine-plus-nap-fips
146+
FROM alpine:3.19@sha256:6380aa6b04faa579332d4c9d1f65bd7093012ba6e01d9bbcd5e2d8a4f9fae38f AS alpine-plus-nap-fips
147147
ARG NGINX_PLUS_VERSION
148148
ARG NGINX_AGENT
149149
ARG NGINX_PLUS_VERSION
150150
ARG PACKAGE_REPO
151151

152152
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
153153

154-
RUN --mount=type=bind,from=alpine-fips-3.17,target=/tmp/fips/ \
154+
RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
155155
--mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
156156
--mount=type=secret,id=nginx-repo.key,dst=/etc/apk/cert.key,mode=0644 \
157157
--mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
@@ -183,15 +183,15 @@ RUN --mount=type=bind,from=alpine-fips-3.17,target=/tmp/fips/ \
183183

184184

185185
############################################# Base image for Alpine with NGINX Plus, App Protect WAFv5 and FIPS #############################################
186-
FROM alpine:3.17@sha256:8fc3dacfb6d69da8d44e42390de777e48577085db99aa4e4af35f483eb08b989 AS alpine-plus-nap-v5-fips
186+
FROM alpine:3.19@sha256:6380aa6b04faa579332d4c9d1f65bd7093012ba6e01d9bbcd5e2d8a4f9fae38f AS alpine-plus-nap-v5-fips
187187
ARG NGINX_PLUS_VERSION
188188
ARG NGINX_AGENT
189189
ARG NGINX_PLUS_VERSION
190190
ARG PACKAGE_REPO
191191

192192
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
193193

194-
RUN --mount=type=bind,from=alpine-fips-3.17,target=/tmp/fips/ \
194+
RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
195195
--mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
196196
--mount=type=secret,id=nginx-repo.key,dst=/etc/apk/cert.key,mode=0644 \
197197
--mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \

‎site/content/technical-specifications.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ _All images include NGINX 1.27.4._
5252
{{< bootstrap-table "table table-bordered table-responsive" >}}
5353
|<div style="width:200px">Name</div> | <div style="width:100px">Base image</div> | <div style="width:200px">Third-party modules</div> | DockerHub image | Architectures |
5454
| ---| --- | --- | --- | --- |
55-
|Alpine-based image | ``nginx:1.27.4-alpine``,<br>based on on ``alpine:3.20`` | NGINX OpenTracing module<br><br>OpenTracing library<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | ``nginx/nginx-ingress:{{< nic-version >}}-alpine`` | arm/v7<br>arm64<br>amd64<br>ppc64le<br>s390x |
55+
|Alpine-based image | ``nginx:1.27.4-alpine``,<br>based on on ``alpine:3.21`` | NGINX OpenTracing module<br><br>OpenTracing library<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | ``nginx/nginx-ingress:{{< nic-version >}}-alpine`` | arm/v7<br>arm64<br>amd64<br>ppc64le<br>s390x |
5656
|Debian-based image | ``nginx:1.27.4``,<br>based on on ``debian:12-slim`` | NGINX OpenTracing module<br><br>OpenTracing library<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | ``nginx/nginx-ingress:{{< nic-version >}}`` | arm/v7<br>arm64<br>amd64<br>ppc64le<br>s390x |
5757
|Ubi-based image | ``redhat/ubi9-minimal`` | | ``nginx/nginx-ingress:{{< nic-version >}}-ubi`` | arm64<br>amd64<br>ppc64le<br>s390x |
5858
{{% /bootstrap-table %}}
@@ -72,10 +72,10 @@ NGINX Plus images are available through the F5 Container registry `private-regis
7272
{{< bootstrap-table "table table-striped table-bordered table-responsive" >}}
7373
|<div style="width:200px">Name</div> | <div style="width:100px">Base image</div> | <div style="width:200px">Third-party modules</div> | F5 Container Registry Image | Architectures |
7474
| ---| ---| --- | --- | --- |
75-
|Alpine-based image | ``alpine:3.20`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}-alpine` | arm64<br>amd64 |
76-
|Alpine-based image with FIPS inside | ``alpine:3.20`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | arm64<br>amd64 |
77-
|Alpine-based image with NGINX App Protect WAF & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic-nap/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | amd64 |
78-
|Alpine-based image with NGINX App Protect WAF v5 & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF v5<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic-nap-v5/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | amd64 |
75+
|Alpine-based image | ``alpine:3.21`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}-alpine` | arm64<br>amd64 |
76+
|Alpine-based image with FIPS inside | ``alpine:3.21`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | arm64<br>amd64 |
77+
|Alpine-based image with NGINX App Protect WAF & FIPS inside | ``alpine:3.19`` | NGINX App Protect WAF<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic-nap/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | amd64 |
78+
|Alpine-based image with NGINX App Protect WAF v5 & FIPS inside | ``alpine:3.19`` | NGINX App Protect WAF v5<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic-nap-v5/nginx-plus-ingress:{{< nic-version >}}-alpine-fips` | amd64 |
7979
|Debian-based image | ``debian:12-slim`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}` | arm64<br>amd64 |
8080
|Debian-based image with NGINX App Protect WAF | ``debian:12-slim`` | NGINX App Protect WAF<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic-nap/nginx-plus-ingress:{{< nic-version >}}` | amd64 |
8181
|Debian-based image with NGINX App Protect WAF v5 | ``debian:12-slim`` | NGINX App Protect WAF v5<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic-nap-v5/nginx-plus-ingress:{{< nic-version >}}` | amd64 |

0 commit comments

Comments
 (0)