From 95fe4acadbc54495913fc1361daedfc65df2a3a6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 30 Nov 2022 14:41:33 -0800 Subject: [PATCH] Update to Alpine 3.17 --- 2.2/alpine/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.5/alpine/Dockerfile | 2 +- 2.6/alpine/Dockerfile | 2 +- 2.7/alpine/Dockerfile | 2 +- versions.json | 10 +++++----- versions.sh | 5 ++++- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index ae258d7..7ecadf1 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.17 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 08ea583..7703e3a 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.17 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ diff --git a/2.5/alpine/Dockerfile b/2.5/alpine/Dockerfile index 474aeb5..2d3e210 100644 --- a/2.5/alpine/Dockerfile +++ b/2.5/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.17 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ diff --git a/2.6/alpine/Dockerfile b/2.6/alpine/Dockerfile index cb3e48c..ddd1d3a 100644 --- a/2.6/alpine/Dockerfile +++ b/2.6/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.17 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile index 64d5034..271fd0c 100644 --- a/2.7/alpine/Dockerfile +++ b/2.7/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.17 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ diff --git a/versions.json b/versions.json index 2ab3dc2..433164f 100644 --- a/versions.json +++ b/versions.json @@ -14,35 +14,35 @@ "version": "2.0.29" }, "2.2": { - "alpine": "3.16", + "alpine": "3.17", "debian": "bullseye-slim", "sha256": "beb407eb08b2c697d115a18c00d6a023f7a0fb2cb99bff9c34c9dfd9d2c52f2b", "url": "https://www.haproxy.org/download/2.2/src/haproxy-2.2.25.tar.gz", "version": "2.2.25" }, "2.4": { - "alpine": "3.16", + "alpine": "3.17", "debian": "bullseye-slim", "sha256": "99bd348a2b0ec58ce99510c4b6a2316e1f88137e59c4d8e0f39a2ecb3415a682", "url": "https://www.haproxy.org/download/2.4/src/haproxy-2.4.19.tar.gz", "version": "2.4.19" }, "2.5": { - "alpine": "3.16", + "alpine": "3.17", "debian": "bullseye-slim", "sha256": "dc9a835c7026537419a311db64669e5782f32de49afc7b45f4277db62bc6b586", "url": "https://www.haproxy.org/download/2.5/src/haproxy-2.5.9.tar.gz", "version": "2.5.9" }, "2.6": { - "alpine": "3.16", + "alpine": "3.17", "debian": "bullseye-slim", "sha256": "d0c80c90c04ae79598b58b9749d53787f00f7b515175e7d8203f2796e6a6594d", "url": "https://www.haproxy.org/download/2.6/src/haproxy-2.6.6.tar.gz", "version": "2.6.6" }, "2.7": { - "alpine": "3.16", + "alpine": "3.17", "debian": "bullseye-slim", "sha256": "4a9aa79ab973615245a90b3ab209c7948419e51c810d14dd39923c3c4bd53e4d", "url": "https://www.haproxy.org/download/2.7/src/devel/haproxy-2.7-dev10.tar.gz", diff --git a/versions.sh b/versions.sh index 81f0669..be80d94 100755 --- a/versions.sh +++ b/versions.sh @@ -17,8 +17,11 @@ declare -A debianSuite=( [1.8]='buster-slim' [2.0]='buster-slim' ) -defaultAlpineVersion='3.16' +defaultAlpineVersion='3.17' declare -A alpineVersion=( + # OpenSSL 3 incompatibilities + [1.8]='3.16' + [2.0]='3.16' ) for version in "${versions[@]}"; do