From 666d119c5f2530d27a69d9ecd1fcd9faa5e65949 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 22 May 2024 14:49:13 +0200 Subject: [PATCH 1/2] Update mainline to Alpine 3.20 --- mainline/alpine-slim/Dockerfile | 2 +- update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mainline/alpine-slim/Dockerfile b/mainline/alpine-slim/Dockerfile index 9d1c1709..44fb1f35 100644 --- a/mainline/alpine-slim/Dockerfile +++ b/mainline/alpine-slim/Dockerfile @@ -3,7 +3,7 @@ # # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.20 LABEL maintainer="NGINX Docker Maintainers " diff --git a/update.sh b/update.sh index a075b075..d5ebc2ce 100755 --- a/update.sh +++ b/update.sh @@ -55,7 +55,7 @@ declare -A debian=( ) declare -A alpine=( - [mainline]='3.19' + [mainline]='3.20' [stable]='3.19' ) From 5c65a91acf2a8dda5bf3e03d99ba59c00c837d0f Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Wed, 14 Aug 2024 14:47:12 -0700 Subject: [PATCH 2/2] Alpine: install curl on architectures we build from source. --- Dockerfile-alpine-otel.template | 1 + Dockerfile-alpine-perl.template | 1 + Dockerfile-alpine-slim.template | 1 + Dockerfile-alpine.template | 1 + mainline/alpine-otel/Dockerfile | 1 + mainline/alpine-perl/Dockerfile | 1 + mainline/alpine-slim/Dockerfile | 1 + mainline/alpine/Dockerfile | 1 + stable/alpine-otel/Dockerfile | 1 + stable/alpine-perl/Dockerfile | 1 + stable/alpine-slim/Dockerfile | 1 + stable/alpine/Dockerfile | 1 + 12 files changed, 12 insertions(+) diff --git a/Dockerfile-alpine-otel.template b/Dockerfile-alpine-otel.template index 027e99ae..f122273e 100644 --- a/Dockerfile-alpine-otel.template +++ b/Dockerfile-alpine-otel.template @@ -32,6 +32,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ xz \ re2-dev \ c-ares-dev \ diff --git a/Dockerfile-alpine-perl.template b/Dockerfile-alpine-perl.template index 660e4b7b..2726d46e 100644 --- a/Dockerfile-alpine-perl.template +++ b/Dockerfile-alpine-perl.template @@ -30,6 +30,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ diff --git a/Dockerfile-alpine-slim.template b/Dockerfile-alpine-slim.template index 6c6f92f2..b60e641e 100644 --- a/Dockerfile-alpine-slim.template +++ b/Dockerfile-alpine-slim.template @@ -48,6 +48,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index cce7c7b8..437eb7e0 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -36,6 +36,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ diff --git a/mainline/alpine-otel/Dockerfile b/mainline/alpine-otel/Dockerfile index a3e926b0..320fb074 100644 --- a/mainline/alpine-otel/Dockerfile +++ b/mainline/alpine-otel/Dockerfile @@ -43,6 +43,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ xz \ re2-dev \ c-ares-dev \ diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile index e5162beb..dc7219fd 100644 --- a/mainline/alpine-perl/Dockerfile +++ b/mainline/alpine-perl/Dockerfile @@ -41,6 +41,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ diff --git a/mainline/alpine-slim/Dockerfile b/mainline/alpine-slim/Dockerfile index 44fb1f35..a9318094 100644 --- a/mainline/alpine-slim/Dockerfile +++ b/mainline/alpine-slim/Dockerfile @@ -54,6 +54,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile index b6b9120a..1bb5b530 100644 --- a/mainline/alpine/Dockerfile +++ b/mainline/alpine/Dockerfile @@ -46,6 +46,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ diff --git a/stable/alpine-otel/Dockerfile b/stable/alpine-otel/Dockerfile index 29ec4cd7..dbb4501e 100644 --- a/stable/alpine-otel/Dockerfile +++ b/stable/alpine-otel/Dockerfile @@ -43,6 +43,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ xz \ re2-dev \ c-ares-dev \ diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile index 099d1c14..077ff3e9 100644 --- a/stable/alpine-perl/Dockerfile +++ b/stable/alpine-perl/Dockerfile @@ -41,6 +41,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ diff --git a/stable/alpine-slim/Dockerfile b/stable/alpine-slim/Dockerfile index c26a8a06..0350ad86 100644 --- a/stable/alpine-slim/Dockerfile +++ b/stable/alpine-slim/Dockerfile @@ -54,6 +54,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \ diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile index adbef674..603b7548 100644 --- a/stable/alpine/Dockerfile +++ b/stable/alpine/Dockerfile @@ -46,6 +46,7 @@ RUN set -x \ bash \ alpine-sdk \ findutils \ + curl \ && su nobody -s /bin/sh -c " \ export HOME=${tempDir} \ && cd ${tempDir} \