docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-11-08 17:02:28 +03:00
Code Activity

Add Debian Trixie (remove Bullseye)

Browse Source 
Also, update `versions.json` sorting to be saner/stabler.
This commit is contained in:
Tianon Gravi
2025-08-08 10:41:29 -07:00
parent 889f9447cd
commit 176bc3c3f0
20 changed files with 154 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
13/bullseye/Dockerfile → 13/trixie/Dockerfile generated
View File

@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bullseye-slim FROM debian:trixie-slim
# explicitly set user/group IDs # explicitly set user/group IDs
RUN set -eux; \ RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
ENV PG_MAJOR 13 ENV PG_MAJOR 13
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 13.21-1.pgdg110+1 ENV PG_VERSION 13.21-1.pgdg130+1
RUN set -ex; \ RUN set -ex; \
\ \
@@ -97,7 +97,7 @@ RUN set -ex; \
export PYTHONDONTWRITEBYTECODE=1; \ export PYTHONDONTWRITEBYTECODE=1; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \ aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream

0
13/bullseye/docker-ensure-initdb.sh → 13/trixie/docker-ensure-initdb.sh generated
View File

0
13/bullseye/docker-entrypoint.sh → 13/trixie/docker-entrypoint.sh generated
View File

6
14/bullseye/Dockerfile → 14/trixie/Dockerfile generated
View File

@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bullseye-slim FROM debian:trixie-slim
# explicitly set user/group IDs # explicitly set user/group IDs
RUN set -eux; \ RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
ENV PG_MAJOR 14 ENV PG_MAJOR 14
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 14.18-1.pgdg110+1 ENV PG_VERSION 14.18-1.pgdg130+1
RUN set -ex; \ RUN set -ex; \
\ \
@@ -97,7 +97,7 @@ RUN set -ex; \
export PYTHONDONTWRITEBYTECODE=1; \ export PYTHONDONTWRITEBYTECODE=1; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \ aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream

0
14/bullseye/docker-ensure-initdb.sh → 14/trixie/docker-ensure-initdb.sh generated
View File

0
14/bullseye/docker-entrypoint.sh → 14/trixie/docker-entrypoint.sh generated
View File

6
15/bullseye/Dockerfile → 15/trixie/Dockerfile generated
View File

@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bullseye-slim FROM debian:trixie-slim
# explicitly set user/group IDs # explicitly set user/group IDs
RUN set -eux; \ RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
ENV PG_MAJOR 15 ENV PG_MAJOR 15
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 15.13-1.pgdg110+1 ENV PG_VERSION 15.13-1.pgdg130+1
RUN set -ex; \ RUN set -ex; \
\ \
@@ -97,7 +97,7 @@ RUN set -ex; \
export PYTHONDONTWRITEBYTECODE=1; \ export PYTHONDONTWRITEBYTECODE=1; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \ aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream

0
15/bullseye/docker-ensure-initdb.sh → 15/trixie/docker-ensure-initdb.sh generated
View File

0
15/bullseye/docker-entrypoint.sh → 15/trixie/docker-entrypoint.sh generated
View File

6
16/bullseye/Dockerfile → 16/trixie/Dockerfile generated
View File

@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bullseye-slim FROM debian:trixie-slim
# explicitly set user/group IDs # explicitly set user/group IDs
RUN set -eux; \ RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
ENV PG_MAJOR 16 ENV PG_MAJOR 16
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 16.9-1.pgdg110+1 ENV PG_VERSION 16.9-1.pgdg130+1
RUN set -ex; \ RUN set -ex; \
\ \
@@ -97,7 +97,7 @@ RUN set -ex; \
export PYTHONDONTWRITEBYTECODE=1; \ export PYTHONDONTWRITEBYTECODE=1; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \ aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream

0
16/bullseye/docker-ensure-initdb.sh → 16/trixie/docker-ensure-initdb.sh generated
View File

0
16/bullseye/docker-entrypoint.sh → 16/trixie/docker-entrypoint.sh generated
View File

6
17/bullseye/Dockerfile → 17/trixie/Dockerfile generated
View File

@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bullseye-slim FROM debian:trixie-slim
# explicitly set user/group IDs # explicitly set user/group IDs
RUN set -eux; \ RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
ENV PG_MAJOR 17 ENV PG_MAJOR 17
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 17.5-1.pgdg110+1 ENV PG_VERSION 17.5-1.pgdg130+1
RUN set -ex; \ RUN set -ex; \
\ \
@@ -97,7 +97,7 @@ RUN set -ex; \
export PYTHONDONTWRITEBYTECODE=1; \ export PYTHONDONTWRITEBYTECODE=1; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \ aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream

0
17/bullseye/docker-ensure-initdb.sh → 17/trixie/docker-ensure-initdb.sh generated
View File

0
17/bullseye/docker-entrypoint.sh → 17/trixie/docker-entrypoint.sh generated
View File

6
18/bullseye/Dockerfile → 18/trixie/Dockerfile generated
View File

@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:bullseye-slim FROM debian:trixie-slim
# explicitly set user/group IDs # explicitly set user/group IDs
RUN set -eux; \ RUN set -eux; \
@@ -89,7 +89,7 @@ RUN set -ex; \
ENV PG_MAJOR 18 ENV PG_MAJOR 18
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 18~beta2-1.pgdg110+1 ENV PG_VERSION 18~beta2-1.pgdg130+1
RUN set -ex; \ RUN set -ex; \
\ \
@@ -97,7 +97,7 @@ RUN set -ex; \
export PYTHONDONTWRITEBYTECODE=1; \ export PYTHONDONTWRITEBYTECODE=1; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR"; \ aptRepo="[ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main $PG_MAJOR"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream

0
18/bullseye/docker-ensure-initdb.sh → 18/trixie/docker-ensure-initdb.sh generated
View File

0
18/bullseye/docker-entrypoint.sh → 18/trixie/docker-entrypoint.sh generated
View File

268
versions.json
View File

@@ -1,176 +1,176 @@
{ {
"13": { "18": {
"alpine": "3.22", "alpine": "3.22",
"bookworm": { "debian": "trixie",
"trixie": {
"version": "18~beta2-1.pgdg130+1",
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"ppc64el" "ppc64el"
], ]
"version": "13.21-1.pgdg120+1"
}, },
"bullseye": {
"arches": [
"amd64",
"arm64",
"ppc64el"
],
"version": "13.21-1.pgdg110+1"
},
"debian": "bookworm",
"major": 13,
"sha256": "dcda1294df45f033b0656cf7a8e4afbbc624c25e1b144aec79530f74d7ef4ab4",
"variants": [ "variants": [
"trixie",
"bookworm", "bookworm",
"bullseye",
"alpine3.22", "alpine3.22",
"alpine3.21" "alpine3.21"
], ],
"version": "13.21"
},
"14": {
"alpine": "3.22",
"bookworm": { "bookworm": {
"version": "18~beta2-1.pgdg120+1",
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"ppc64el" "ppc64el"
], ]
"version": "14.18-1.pgdg120+1"
}, },
"bullseye": { "version": "18beta2",
"arches": [ "sha256": "1d16b58244b630194432b88d9ff25f5fea85a001ff2c715a157d4be6787f3075",
"amd64", "major": 18
"arm64",
"ppc64el"
],
"version": "14.18-1.pgdg110+1"
},
"debian": "bookworm",
"major": 14,
"sha256": "83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e",
"variants": [
"bookworm",
"bullseye",
"alpine3.22",
"alpine3.21"
],
"version": "14.18"
},
"15": {
"alpine": "3.22",
"bookworm": {
"arches": [
"amd64",
"arm64",
"ppc64el"
],
"version": "15.13-1.pgdg120+1"
},
"bullseye": {
"arches": [
"amd64",
"arm64",
"ppc64el"
],
"version": "15.13-1.pgdg110+1"
},
"debian": "bookworm",
"major": 15,
"sha256": "4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d",
"variants": [
"bookworm",
"bullseye",
"alpine3.22",
"alpine3.21"
],
"version": "15.13"
},
"16": {
"alpine": "3.22",
"bookworm": {
"arches": [
"amd64",
"arm64",
"ppc64el"
],
"version": "16.9-1.pgdg120+1"
},
"bullseye": {
"arches": [
"amd64",
"arm64",
"ppc64el"
],
"version": "16.9-1.pgdg110+1"
},
"debian": "bookworm",
"major": 16,
"sha256": "07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005",
"variants": [
"bookworm",
"bullseye",
"alpine3.22",
"alpine3.21"
],
"version": "16.9"
}, },
"17": { "17": {
"alpine": "3.22", "alpine": "3.22",
"debian": "trixie",
"trixie": {
"version": "17.5-1.pgdg130+1",
"arches": [
"amd64",
"arm64",
"ppc64el"
]
},
"variants": [
"trixie",
"bookworm",
"alpine3.22",
"alpine3.21"
],
"bookworm": { "bookworm": {
"version": "17.5-1.pgdg120+1",
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"ppc64el" "ppc64el"
], ]
"version": "17.5-1.pgdg120+1"
}, },
"bullseye": { "version": "17.5",
"arches": [
"amd64",
"arm64",
"ppc64el"
],
"version": "17.5-1.pgdg110+1"
},
"debian": "bookworm",
"major": 17,
"sha256": "fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8", "sha256": "fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8",
"variants": [ "major": 17
"bookworm",
"bullseye",
"alpine3.22",
"alpine3.21"
],
"version": "17.5"
}, },
"18": { "16": {
"alpine": "3.22", "alpine": "3.22",
"bookworm": { "debian": "trixie",
"trixie": {
"version": "16.9-1.pgdg130+1",
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"ppc64el" "ppc64el"
], ]
"version": "18~beta2-1.pgdg120+1"
}, },
"bullseye": {
"arches": [
"amd64",
"arm64",
"ppc64el"
],
"version": "18~beta2-1.pgdg110+1"
},
"debian": "bookworm",
"major": 18,
"sha256": "1d16b58244b630194432b88d9ff25f5fea85a001ff2c715a157d4be6787f3075",
"variants": [ "variants": [
"trixie",
"bookworm", "bookworm",
"bullseye",
"alpine3.22", "alpine3.22",
"alpine3.21" "alpine3.21"
], ],
"version": "18beta2" "bookworm": {
"version": "16.9-1.pgdg120+1",
"arches": [
"amd64",
"arm64",
"ppc64el"
]
},
"version": "16.9",
"sha256": "07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005",
"major": 16
},
"15": {
"alpine": "3.22",
"debian": "trixie",
"trixie": {
"version": "15.13-1.pgdg130+1",
"arches": [
"amd64",
"arm64",
"ppc64el"
]
},
"variants": [
"trixie",
"bookworm",
"alpine3.22",
"alpine3.21"
],
"bookworm": {
"version": "15.13-1.pgdg120+1",
"arches": [
"amd64",
"arm64",
"ppc64el"
]
},
"version": "15.13",
"sha256": "4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d",
"major": 15
},
"14": {
"alpine": "3.22",
"debian": "trixie",
"trixie": {
"version": "14.18-1.pgdg130+1",
"arches": [
"amd64",
"arm64",
"ppc64el"
]
},
"variants": [
"trixie",
"bookworm",
"alpine3.22",
"alpine3.21"
],
"bookworm": {
"version": "14.18-1.pgdg120+1",
"arches": [
"amd64",
"arm64",
"ppc64el"
]
},
"version": "14.18",
"sha256": "83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e",
"major": 14
},
"13": {
"alpine": "3.22",
"debian": "trixie",
"trixie": {
"version": "13.21-1.pgdg130+1",
"arches": [
"amd64",
"arm64",
"ppc64el"
]
},
"variants": [
"trixie",
"bookworm",
"alpine3.22",
"alpine3.21"
],
"bookworm": {
"version": "13.21-1.pgdg120+1",
"arches": [
"amd64",
"arm64",
"ppc64el"
]
},
"version": "13.21",
"sha256": "dcda1294df45f033b0656cf7a8e4afbbc624c25e1b144aec79530f74d7ef4ab4",
"major": 13
} }
} }

4
versions.sh
View File

@@ -3,8 +3,8 @@ set -Eeuo pipefail
# we will support at most two entries in each of these lists, and both should be in descending order # we will support at most two entries in each of these lists, and both should be in descending order
supportedDebianSuites=( supportedDebianSuites=(
trixie
bookworm bookworm
bullseye
) )
supportedAlpineVersions=( supportedAlpineVersions=(
3.22 3.22
@@ -151,4 +151,4 @@ for version in "${versions[@]}"; do
')" ')"
done done
jq <<<"$json" -S . > versions.json jq <<<"$json" 'to_entries | sort_by(.key | split(".") | map(tonumber? // .)) | reverse | from_entries' > versions.json