Skip to content

Commit b3b9e1c

Browse files
alessfgalessfg
committed
Update mainline NGINX to 1.25.5
* And update mainline Alpine to 3.19 and mainline NJS to 0.8.4 * And fix mainline Alpine GH Actions workflow
1 parent 92b5b2f commit b3b9e1c

File tree

8 files changed

+22
-47
lines changed

8 files changed

+22
-47
lines changed

‎.github/workflows/alpine-mainline.yml‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ jobs:
8888
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
8989
with:
9090
images: |
91+
docker.io/nginxinc/nginx-unprivileged
9192
ghcr.io/nginxinc/nginx-unprivileged
93+
public.ecr.aws/nginx/nginx-unprivileged
94+
quay.io/nginx/nginx-unprivileged
9295
tags: |
9396
type=raw,value=${{ needs.version.outputs.major }}.${{ needs.version.outputs.minor }}.${{ needs.version.outputs.patch }}-alpine-slim
9497
type=raw,value=${{ needs.version.outputs.major }}.${{ needs.version.outputs.minor }}.${{ needs.version.outputs.patch }}-alpine${{ needs.version.outputs.distro }}-slim
@@ -380,33 +383,3 @@ jobs:
380383
DOCKER_CONTENT_TRUST_REPOSITORY_KEY_ID: ${{ secrets.DOCKER_CONTENT_TRUST_REPOSITORY_KEY_ID }}
381384
DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ secrets.DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE }}
382385
NOTARY_TARGETS_PASSPHRASE: ${{ secrets.DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE }}
383-
384-
cleanup:
385-
name: Delete untagged Alpine NGINX mainline Docker images on the Amazon ECR Public Gallery and the GitHub Container Registry
386-
if: ${{ github.event_name != 'pull_request' }}
387-
runs-on: ubuntu-22.04
388-
strategy:
389-
fail-fast: false
390-
needs: [slim, core, perl]
391-
steps:
392-
- name: Check out the codebase
393-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
394-
395-
- name: Configure AWS credentials
396-
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
397-
with:
398-
aws-region: ${{ secrets.AWS_REGION }}
399-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
400-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
401-
402-
- name: Delete untagged Alpine NGINX mainline Docker images on the Amazon ECR Public Gallery
403-
run: |
404-
.github/workflows/scripts/delete-untagged-amazon-public-ecr-images.sh
405-
406-
- name: Delete untagged Alpine NGINX mainline Docker images on the GitHub Container Registry
407-
uses: stumpylog/image-cleaner-action/untagged@9255a1b3b8ca44b3e5887e2168155223b277ca1d # v0.5.0
408-
with:
409-
is_org: true
410-
owner: nginxinc
411-
package_name: nginx-unprivileged
412-
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/debian-mainline.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ jobs:
110110
id: build
111111
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
112112
with:
113-
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
113+
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
114+
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
114115
context: "{{ defaultContext }}:mainline/debian"
115116
labels: ${{ steps.meta.outputs.labels }}
116117
annotations: ${{ steps.meta.outputs.annotations }}
@@ -228,7 +229,8 @@ jobs:
228229
id: build
229230
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
230231
with:
231-
platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
232+
platforms: linux/amd64, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
233+
# platforms: linux/amd64, linux/arm/v5, linux/arm/v7, linux/arm64, linux/386, linux/mips64le, linux/ppc64le, linux/s390x
232234
context: "{{ defaultContext }}:mainline/debian-perl"
233235
labels: ${{ steps.meta.outputs.labels }}
234236
annotations: ${{ steps.meta.outputs.annotations }}

‎mainline/alpine-perl/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.4-alpine
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.5-alpine
77
FROM $IMAGE
88

99
ARG UID=101
@@ -61,7 +61,7 @@ RUN set -x \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
6363
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
64+
&& PKGOSSCHECKSUM=\"74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6565
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \

‎mainline/alpine-slim/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-
ARG IMAGE=alpine:3.18
6+
ARG IMAGE=alpine:3.19
77
FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.25.4
11+
ENV NGINX_VERSION 1.25.5
1212
ENV PKG_RELEASE 1
1313

1414
ARG UID=101
@@ -61,7 +61,7 @@ RUN set -x \
6161
export HOME=${tempDir} \
6262
&& cd ${tempDir} \
6363
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
64-
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
64+
&& PKGOSSCHECKSUM=\"74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6565
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
6666
echo \"pkg-oss tarball checksum verification succeeded!\"; \
6767
else \

‎mainline/alpine/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.4-alpine-slim
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.5-alpine-slim
77
FROM $IMAGE
88

9-
ENV NJS_VERSION 0.8.3
9+
ENV NJS_VERSION 0.8.4
1010

1111
ARG UID=101
1212
ARG GID=101
@@ -65,7 +65,7 @@ RUN set -x \
6565
export HOME=${tempDir} \
6666
&& cd ${tempDir} \
6767
&& curl -f -O https://hg.nginx.org/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
68-
&& PKGOSSCHECKSUM=\"79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
68+
&& PKGOSSCHECKSUM=\"74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5 *${NGINX_VERSION}-${PKG_RELEASE}.tar.gz\" \
6969
&& if [ \"\$(openssl sha512 -r ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz)\" = \"\$PKGOSSCHECKSUM\" ]; then \
7070
echo \"pkg-oss tarball checksum verification succeeded!\"; \
7171
else \

‎mainline/debian-perl/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
6-
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.4
6+
ARG IMAGE=nginxinc/nginx-unprivileged:1.25.5
77
FROM $IMAGE
88

99
ARG UID=101

‎mainline/debian/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM $IMAGE
88

99
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
1010

11-
ENV NGINX_VERSION 1.25.4
12-
ENV NJS_VERSION 0.8.3
11+
ENV NGINX_VERSION 1.25.5
12+
ENV NJS_VERSION 0.8.4
1313
ENV PKG_RELEASE 1~bookworm
1414

1515
ARG UID=101

‎update.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ declare branches=(
1212
# Current nginx versions
1313
# Remember to update pkgosschecksum when changing this.
1414
declare -A nginx=(
15-
[mainline]='1.25.4'
15+
[mainline]='1.25.5'
1616
[stable]='1.24.0'
1717
)
1818

1919
# Current njs versions
2020
declare -A njs=(
21-
[mainline]='0.8.3'
21+
[mainline]='0.8.4'
2222
[stable]='0.8.0'
2323
)
2424

@@ -35,7 +35,7 @@ declare -A debian=(
3535
)
3636

3737
declare -A alpine=(
38-
[mainline]='3.18'
38+
[mainline]='3.19'
3939
[stable]='3.18'
4040
)
4141

@@ -52,7 +52,7 @@ declare -A rev=(
5252
# revision/tag in the previous block
5353
# Used in alpine builds for architectures not packaged by nginx.org
5454
declare -A pkgosschecksum=(
55-
[mainline]='79bf214256bf55700c776a87abfc3cf542323a267d879e89110aa44b551d12f6df7d56676a68f255ebbb54275185980d1fa37075f000d98e0ecac28db9e89fe3'
55+
[mainline]='74000f32ab250be492a8ae4d408cd63a4c422f4f0af84689973a2844fceeb8a3e7e12b04d7c6dac0f993d7102d920a5f60e6f49be23ce4093f48a8eb1ae36ce5'
5656
[stable]='4f33347bf05e7d7dd42a52b6e7af7ec21e3ed71df05a8ec16dd1228425f04e4318d88b1340370ccb6ad02cde590fc102094ddffbb1fc86d2085295a43f02f67b'
5757
)
5858

0 commit comments

Comments
 (0)