From 930acaf01ff536090a3bb304cf823a8cc777b658 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Wed, 22 May 2024 22:39:44 +0200 Subject: [PATCH] Update to alpine 3.20 --- 12/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- .../docker-ensure-initdb.sh | 0 .../docker-entrypoint.sh | 0 13/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- .../docker-ensure-initdb.sh | 0 .../docker-entrypoint.sh | 0 14/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- .../docker-ensure-initdb.sh | 0 .../docker-entrypoint.sh | 0 15/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- .../docker-ensure-initdb.sh | 0 .../docker-entrypoint.sh | 0 16/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- .../docker-ensure-initdb.sh | 0 .../docker-entrypoint.sh | 0 versions.json | 30 +++++++++---------- versions.sh | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) rename 12/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 12/{alpine3.18 => alpine3.20}/docker-ensure-initdb.sh (100%) rename 12/{alpine3.18 => alpine3.20}/docker-entrypoint.sh (100%) rename 13/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 13/{alpine3.18 => alpine3.20}/docker-ensure-initdb.sh (100%) rename 13/{alpine3.18 => alpine3.20}/docker-entrypoint.sh (100%) rename 14/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 14/{alpine3.18 => alpine3.20}/docker-ensure-initdb.sh (100%) rename 14/{alpine3.18 => alpine3.20}/docker-entrypoint.sh (100%) rename 15/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 15/{alpine3.18 => alpine3.20}/docker-ensure-initdb.sh (100%) rename 15/{alpine3.18 => alpine3.20}/docker-entrypoint.sh (100%) rename 16/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 16/{alpine3.18 => alpine3.20}/docker-ensure-initdb.sh (100%) rename 16/{alpine3.18 => alpine3.20}/docker-entrypoint.sh (100%) diff --git a/12/alpine3.18/Dockerfile b/12/alpine3.20/Dockerfile similarity index 99% rename from 12/alpine3.18/Dockerfile rename to 12/alpine3.20/Dockerfile index ca48d22265..e68037b78b 100644 --- a/12/alpine3.18/Dockerfile +++ b/12/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable diff --git a/12/alpine3.18/docker-ensure-initdb.sh b/12/alpine3.20/docker-ensure-initdb.sh similarity index 100% rename from 12/alpine3.18/docker-ensure-initdb.sh rename to 12/alpine3.20/docker-ensure-initdb.sh diff --git a/12/alpine3.18/docker-entrypoint.sh b/12/alpine3.20/docker-entrypoint.sh similarity index 100% rename from 12/alpine3.18/docker-entrypoint.sh rename to 12/alpine3.20/docker-entrypoint.sh diff --git a/13/alpine3.18/Dockerfile b/13/alpine3.20/Dockerfile similarity index 99% rename from 13/alpine3.18/Dockerfile rename to 13/alpine3.20/Dockerfile index 465b514876..43fa0ea471 100644 --- a/13/alpine3.18/Dockerfile +++ b/13/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable diff --git a/13/alpine3.18/docker-ensure-initdb.sh b/13/alpine3.20/docker-ensure-initdb.sh similarity index 100% rename from 13/alpine3.18/docker-ensure-initdb.sh rename to 13/alpine3.20/docker-ensure-initdb.sh diff --git a/13/alpine3.18/docker-entrypoint.sh b/13/alpine3.20/docker-entrypoint.sh similarity index 100% rename from 13/alpine3.18/docker-entrypoint.sh rename to 13/alpine3.20/docker-entrypoint.sh diff --git a/14/alpine3.18/Dockerfile b/14/alpine3.20/Dockerfile similarity index 99% rename from 14/alpine3.18/Dockerfile rename to 14/alpine3.20/Dockerfile index b1fbd8d556..0ea12b04fa 100644 --- a/14/alpine3.18/Dockerfile +++ b/14/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable diff --git a/14/alpine3.18/docker-ensure-initdb.sh b/14/alpine3.20/docker-ensure-initdb.sh similarity index 100% rename from 14/alpine3.18/docker-ensure-initdb.sh rename to 14/alpine3.20/docker-ensure-initdb.sh diff --git a/14/alpine3.18/docker-entrypoint.sh b/14/alpine3.20/docker-entrypoint.sh similarity index 100% rename from 14/alpine3.18/docker-entrypoint.sh rename to 14/alpine3.20/docker-entrypoint.sh diff --git a/15/alpine3.18/Dockerfile b/15/alpine3.20/Dockerfile similarity index 99% rename from 15/alpine3.18/Dockerfile rename to 15/alpine3.20/Dockerfile index 87a2ce7ae0..8c67066559 100644 --- a/15/alpine3.18/Dockerfile +++ b/15/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable diff --git a/15/alpine3.18/docker-ensure-initdb.sh b/15/alpine3.20/docker-ensure-initdb.sh similarity index 100% rename from 15/alpine3.18/docker-ensure-initdb.sh rename to 15/alpine3.20/docker-ensure-initdb.sh diff --git a/15/alpine3.18/docker-entrypoint.sh b/15/alpine3.20/docker-entrypoint.sh similarity index 100% rename from 15/alpine3.18/docker-entrypoint.sh rename to 15/alpine3.20/docker-entrypoint.sh diff --git a/16/alpine3.18/Dockerfile b/16/alpine3.20/Dockerfile similarity index 99% rename from 16/alpine3.18/Dockerfile rename to 16/alpine3.20/Dockerfile index 17b0859ffe..d07b848af4 100644 --- a/16/alpine3.18/Dockerfile +++ b/16/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable diff --git a/16/alpine3.18/docker-ensure-initdb.sh b/16/alpine3.20/docker-ensure-initdb.sh similarity index 100% rename from 16/alpine3.18/docker-ensure-initdb.sh rename to 16/alpine3.20/docker-ensure-initdb.sh diff --git a/16/alpine3.18/docker-entrypoint.sh b/16/alpine3.20/docker-entrypoint.sh similarity index 100% rename from 16/alpine3.18/docker-entrypoint.sh rename to 16/alpine3.20/docker-entrypoint.sh diff --git a/versions.json b/versions.json index bd0b1c943f..71d306eba5 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "12": { - "alpine": "3.19", + "alpine": "3.20", "bookworm": { "arches": [ "amd64", @@ -25,13 +25,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "version": "12.19" }, "13": { - "alpine": "3.19", + "alpine": "3.20", "bookworm": { "arches": [ "amd64", @@ -56,13 +56,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "version": "13.15" }, "14": { - "alpine": "3.19", + "alpine": "3.20", "bookworm": { "arches": [ "amd64", @@ -87,13 +87,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "version": "14.12" }, "15": { - "alpine": "3.19", + "alpine": "3.20", "bookworm": { "arches": [ "amd64", @@ -118,13 +118,13 @@ "variants": [ "bookworm", "bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "version": "15.7" }, "16": { - "alpine": "3.19", + "alpine": "3.20", "bookworm": { "arches": [ "amd64", @@ -149,8 +149,8 @@ "variants": [ "bookworm", "bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "version": "16.3" } diff --git a/versions.sh b/versions.sh index b50f99ed38..e8c1225d53 100755 --- a/versions.sh +++ b/versions.sh @@ -7,8 +7,8 @@ supportedDebianSuites=( bullseye ) supportedAlpineVersions=( + 3.20 3.19 - 3.18 ) defaultDebianSuite="${supportedDebianSuites[0]}" declare -A debianSuites=(