From 8319188779e45910b4cbf471e993bbc5ecac9b86 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 31 May 2023 10:19:34 -0700 Subject: [PATCH] Update to Alpine 3.18 --- 2.2/alpine/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.6/alpine/Dockerfile | 2 +- 2.7/alpine/Dockerfile | 2 +- 2.8/alpine/Dockerfile | 2 +- 2.9/alpine/Dockerfile | 2 +- versions.json | 12 ++++++------ versions.sh | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 0ff01d4..4e58160 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.18 # 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 defe9c5..a14f8e1 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.18 # 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 143fd9c..c7aabf6 100644 --- a/2.6/alpine/Dockerfile +++ b/2.6/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.18 # 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 0590a34..67cea1a 100644 --- a/2.7/alpine/Dockerfile +++ b/2.7/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.18 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ diff --git a/2.8/alpine/Dockerfile b/2.8/alpine/Dockerfile index 86feaad..cbf139b 100644 --- a/2.8/alpine/Dockerfile +++ b/2.8/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.18 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ diff --git a/2.9/alpine/Dockerfile b/2.9/alpine/Dockerfile index 6451269..b861fa9 100644 --- a/2.9/alpine/Dockerfile +++ b/2.9/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.18 # 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 fd62b5b..60fce80 100644 --- a/versions.json +++ b/versions.json @@ -7,42 +7,42 @@ "version": "2.0.31" }, "2.2": { - "alpine": "3.17", + "alpine": "3.18", "debian": "bullseye-slim", "sha256": "1e41f49674fbf5663b55c5f7919a7d05e480730653f2bcdec384b8836efc1fb0", "url": "https://www.haproxy.org/download/2.2/src/haproxy-2.2.29.tar.gz", "version": "2.2.29" }, "2.4": { - "alpine": "3.17", + "alpine": "3.18", "debian": "bullseye-slim", "sha256": "0895340b36b704a1dbb25fea3bbaee5ff606399d6943486ebd7f256fee846d3a", "url": "https://www.haproxy.org/download/2.4/src/haproxy-2.4.22.tar.gz", "version": "2.4.22" }, "2.6": { - "alpine": "3.17", + "alpine": "3.18", "debian": "bullseye-slim", "sha256": "d69ff5233dbca657132ef280d111222ec1e33f5be1c1937d4e9ff516f63f5243", "url": "https://www.haproxy.org/download/2.6/src/haproxy-2.6.13.tar.gz", "version": "2.6.13" }, "2.7": { - "alpine": "3.17", + "alpine": "3.18", "debian": "bullseye-slim", "sha256": "15f2276971bbba8c47d86cc82ebfc6ec33e3aef2e4565058b2e4950c07b8e75c", "url": "https://www.haproxy.org/download/2.7/src/haproxy-2.7.8.tar.gz", "version": "2.7.8" }, "2.8": { - "alpine": "3.17", + "alpine": "3.18", "debian": "bullseye-slim", "sha256": "61cdafb5db7e9174d0757b8e4bcde938352306fb7cc8ff2b5f55c26dd48a6cf7", "url": "https://www.haproxy.org/download/2.8/src/haproxy-2.8.0.tar.gz", "version": "2.8.0" }, "2.9": { - "alpine": "3.17", + "alpine": "3.18", "debian": "bullseye-slim", "sha256": "3dce5c3d6b515ccbf592862cc20b799fc111e296c0ac59fe602bf0980cdd5169", "url": "https://www.haproxy.org/download/2.9/src/devel/haproxy-2.9-dev0.tar.gz", diff --git a/versions.sh b/versions.sh index 1972540..5bddbda 100755 --- a/versions.sh +++ b/versions.sh @@ -16,7 +16,7 @@ defaultDebianSuite='bullseye-slim' declare -A debianSuite=( [2.0]='buster-slim' ) -defaultAlpineVersion='3.17' +defaultAlpineVersion='3.18' declare -A alpineVersion=( # OpenSSL 3 incompatibilities [2.0]='3.16'