Merge pull request #1416 from J0WI/alpine-3.24

Add Alpine 3.24 and drop 3.22
This commit is contained in:
yosifkit authored and GitHub committed 2026-06-10 16:57:28 -07:00
commit be0b7ac960
27 files changed
+74 -74

No files matched your search

+4 -4
View File
@@ -57,8 +57,8 @@ ENV PG_VERSION 14.23
ENV PG_SHA256 cc7216822b546330e29c2f91e123c8734a4c41795082145bb962aa712e8c94a5
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -112,9 +112,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
+5 -5
View File
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.22
FROM alpine:3.24
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
@@ -57,8 +57,8 @@ ENV PG_VERSION 14.23
ENV PG_SHA256 cc7216822b546330e29c2f91e123c8734a4c41795082145bb962aa712e8c94a5
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -112,9 +112,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
File renamed without changes.
File renamed without changes.
+4 -4
View File
@@ -57,8 +57,8 @@ ENV PG_VERSION 15.18
ENV PG_SHA256 11df0df97fe3ea4ba9a791faaf39cee1d2fe571e78885b5b55d8517d27c323b4
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -114,9 +114,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
+5 -5
View File
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.22
FROM alpine:3.24
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
@@ -57,8 +57,8 @@ ENV PG_VERSION 15.18
ENV PG_SHA256 11df0df97fe3ea4ba9a791faaf39cee1d2fe571e78885b5b55d8517d27c323b4
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -114,9 +114,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
File renamed without changes.
File renamed without changes.
+4 -4
View File
@@ -57,8 +57,8 @@ ENV PG_VERSION 16.14
ENV PG_SHA256 f6d077142737920858ce958ccdb75c6ee137a63b5b0853c70693d401ac7e3471
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -114,9 +114,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
+5 -5
View File
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.22
FROM alpine:3.24
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
@@ -57,8 +57,8 @@ ENV PG_VERSION 16.14
ENV PG_SHA256 f6d077142737920858ce958ccdb75c6ee137a63b5b0853c70693d401ac7e3471
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -114,9 +114,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
File renamed without changes.
File renamed without changes.
+4 -4
View File
@@ -56,8 +56,8 @@ ENV PG_VERSION 17.10
ENV PG_SHA256 078a03516dcdbdb705fecaf415ea3d13a956c589e46f09fed68a06fb00598c90
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -113,9 +113,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
+5 -5
View File
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.22
FROM alpine:3.24
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
@@ -56,8 +56,8 @@ ENV PG_VERSION 17.10
ENV PG_SHA256 078a03516dcdbdb705fecaf415ea3d13a956c589e46f09fed68a06fb00598c90
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -113,9 +113,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
File renamed without changes.
File renamed without changes.
+4 -4
View File
@@ -56,8 +56,8 @@ ENV PG_VERSION 18.4
ENV PG_SHA256 81a81ec695fb0c7901407defaa1d2f7973617154cf27ba74e3a7ab8e64436094
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -119,9 +119,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
+5 -5
View File
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.22
FROM alpine:3.24
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
@@ -56,8 +56,8 @@ ENV PG_VERSION 18.4
ENV PG_SHA256 81a81ec695fb0c7901407defaa1d2f7973617154cf27ba74e3a7ab8e64436094
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -119,9 +119,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
File renamed without changes.
File renamed without changes.
+4 -4
View File
@@ -56,8 +56,8 @@ ENV PG_VERSION 19beta1
ENV PG_SHA256 d8c8d3e18c12e9fb792b3e927049900d40571f4ef6167017a23e5bbfc40d30ee
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -119,9 +119,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
+5 -5
View File
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.22
FROM alpine:3.24
# 70 is the standard uid/gid for "postgres" in Alpine
# https://git.alpinelinux.org/aports/tree/main/postgresql-common/postgresql-common.pre-install?h=3.22-stable
@@ -56,8 +56,8 @@ ENV PG_VERSION 19beta1
ENV PG_SHA256 d8c8d3e18c12e9fb792b3e927049900d40571f4ef6167017a23e5bbfc40d30ee
ENV DOCKER_PG_LLVM_DEPS \
llvm19-dev \
clang19
llvm21-dev \
clang21
RUN set -eux; \
\
@@ -119,9 +119,9 @@ RUN set -eux; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
\
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n176 ("export LLVM_CONFIG")
export LLVM_CONFIG="/usr/lib/llvm19/bin/llvm-config"; \
export LLVM_CONFIG="/usr/lib/llvm21/bin/llvm-config"; \
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.22-stable#n180 ("older clang versions don't have a 'clang' exe anymore.")
export CLANG=clang-19; \
export CLANG=clang-21; \
\
# configure options mostly copying Debian:
# https://salsa.debian.org/postgresql/postgresql-common/-/blob/6e26b5107295170cc8731a3acbf13228ea15941e/server/postgresql.mk#L32
File renamed without changes.
File renamed without changes.
+1 -1
View File
@@ -58,7 +58,7 @@ ENV PG_SHA256 {{ .sha256 }}
{{
def llvmver:
"19"
"21"
-}}
ENV DOCKER_PG_LLVM_DEPS \
llvm{{ llvmver }}-dev \
+18 -18
View File
@@ -1,6 +1,6 @@
{
"19": {
"alpine": "3.23",
"alpine": "3.24",
"debian": "trixie",
"trixie": {
"version": "19~beta1-1.pgdg13+1",
@@ -13,8 +13,8 @@
"variants": [
"trixie",
"bookworm",
"alpine3.23",
"alpine3.22"
"alpine3.24",
"alpine3.23"
],
"bookworm": {
"version": "19~beta1-1.pgdg12+1",
@@ -29,7 +29,7 @@
"major": 19
},
"18": {
"alpine": "3.23",
"alpine": "3.24",
"debian": "trixie",
"trixie": {
"version": "18.4-1.pgdg13+1",
@@ -42,8 +42,8 @@
"variants": [
"trixie",
"bookworm",
"alpine3.23",
"alpine3.22"
"alpine3.24",
"alpine3.23"
],
"bookworm": {
"version": "18.4-1.pgdg12+1",
@@ -58,7 +58,7 @@
"major": 18
},
"17": {
"alpine": "3.23",
"alpine": "3.24",
"debian": "trixie",
"trixie": {
"version": "17.10-1.pgdg13+1",
@@ -71,8 +71,8 @@
"variants": [
"trixie",
"bookworm",
"alpine3.23",
"alpine3.22"
"alpine3.24",
"alpine3.23"
],
"bookworm": {
"version": "17.10-1.pgdg12+1",
@@ -87,7 +87,7 @@
"major": 17
},
"16": {
"alpine": "3.23",
"alpine": "3.24",
"debian": "trixie",
"trixie": {
"version": "16.14-1.pgdg13+1",
@@ -100,8 +100,8 @@
"variants": [
"trixie",
"bookworm",
"alpine3.23",
"alpine3.22"
"alpine3.24",
"alpine3.23"
],
"bookworm": {
"version": "16.14-1.pgdg12+1",
@@ -116,7 +116,7 @@
"major": 16
},
"15": {
"alpine": "3.23",
"alpine": "3.24",
"debian": "trixie",
"trixie": {
"version": "15.18-1.pgdg13+1",
@@ -129,8 +129,8 @@
"variants": [
"trixie",
"bookworm",
"alpine3.23",
"alpine3.22"
"alpine3.24",
"alpine3.23"
],
"bookworm": {
"version": "15.18-1.pgdg12+1",
@@ -145,7 +145,7 @@
"major": 15
},
"14": {
"alpine": "3.23",
"alpine": "3.24",
"debian": "trixie",
"trixie": {
"version": "14.23-1.pgdg13+1",
@@ -158,8 +158,8 @@
"variants": [
"trixie",
"bookworm",
"alpine3.23",
"alpine3.22"
"alpine3.24",
"alpine3.23"
],
"bookworm": {
"version": "14.23-1.pgdg12+1",
+1 -1
View File
@@ -7,8 +7,8 @@ supportedDebianSuites=(
bookworm
)
supportedAlpineVersions=(
3.24
3.23
3.22
)
defaultDebianSuite="${supportedDebianSuites[0]}"
declare -A debianSuites=(