docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-07-28 10:42:06 +03:00
Code Activity

Update from Buster to Bullseye

Browse Source
This commit is contained in:
Tianon Gravi
2021-09-09 09:42:25 -07:00
parent b4b726dbf1
commit d50c412c4e
15 changed files with 56 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
10/buster/Dockerfile → 10/bullseye/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -ex; \ RUN set -ex; \
if ! command -v gpg > /dev/null; then \ if ! command -v gpg > /dev/null; then \
@ -90,7 +90,7 @@ RUN set -ex; \
ENV PG_MAJOR 10 ENV PG_MAJOR 10
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 10.18-1.pgdg100+1 ENV PG_VERSION 10.18-1.pgdg110+1
RUN set -ex; \ RUN set -ex; \
\ \
@ -99,15 +99,15 @@ RUN set -ex; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | i386 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
apt-get update; \ apt-get update; \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from their published source packages # let's build binaries from their published source packages
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
\ \
tempDir="$(mktemp -d)"; \ tempDir="$(mktemp -d)"; \
cd "$tempDir"; \ cd "$tempDir"; \

0
10/buster/docker-entrypoint.sh → 10/bullseye/docker-entrypoint.sh generated
View File

10
11/buster/Dockerfile → 11/bullseye/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -ex; \ RUN set -ex; \
if ! command -v gpg > /dev/null; then \ if ! command -v gpg > /dev/null; then \
@ -90,7 +90,7 @@ RUN set -ex; \
ENV PG_MAJOR 11 ENV PG_MAJOR 11
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 11.13-1.pgdg100+1 ENV PG_VERSION 11.13-1.pgdg110+1
RUN set -ex; \ RUN set -ex; \
\ \
@ -99,15 +99,15 @@ RUN set -ex; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | i386 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
apt-get update; \ apt-get update; \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from their published source packages # let's build binaries from their published source packages
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
\ \
tempDir="$(mktemp -d)"; \ tempDir="$(mktemp -d)"; \
cd "$tempDir"; \ cd "$tempDir"; \

0
11/buster/docker-entrypoint.sh → 11/bullseye/docker-entrypoint.sh generated
View File

10
12/buster/Dockerfile → 12/bullseye/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -ex; \ RUN set -ex; \
if ! command -v gpg > /dev/null; then \ if ! command -v gpg > /dev/null; then \
@ -90,7 +90,7 @@ RUN set -ex; \
ENV PG_MAJOR 12 ENV PG_MAJOR 12
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 12.8-1.pgdg100+1 ENV PG_VERSION 12.8-1.pgdg110+1
RUN set -ex; \ RUN set -ex; \
\ \
@ -99,15 +99,15 @@ RUN set -ex; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | i386 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
apt-get update; \ apt-get update; \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from their published source packages # let's build binaries from their published source packages
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
\ \
tempDir="$(mktemp -d)"; \ tempDir="$(mktemp -d)"; \
cd "$tempDir"; \ cd "$tempDir"; \

0
12/buster/docker-entrypoint.sh → 12/bullseye/docker-entrypoint.sh generated
View File

10
13/buster/Dockerfile → 13/bullseye/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -ex; \ RUN set -ex; \
if ! command -v gpg > /dev/null; then \ if ! command -v gpg > /dev/null; then \
@ -90,7 +90,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.4-1.pgdg100+1 ENV PG_VERSION 13.4-1.pgdg110+1
RUN set -ex; \ RUN set -ex; \
\ \
@ -99,15 +99,15 @@ RUN set -ex; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | i386 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
apt-get update; \ apt-get update; \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from their published source packages # let's build binaries from their published source packages
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
\ \
tempDir="$(mktemp -d)"; \ tempDir="$(mktemp -d)"; \
cd "$tempDir"; \ cd "$tempDir"; \

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

10
14/buster/Dockerfile → 14/bullseye/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -ex; \ RUN set -ex; \
if ! command -v gpg > /dev/null; then \ if ! command -v gpg > /dev/null; then \
@ -90,7 +90,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~beta3-1.pgdg100+1 ENV PG_VERSION 14~beta3-1.pgdg110+1
RUN set -ex; \ RUN set -ex; \
\ \
@ -99,15 +99,15 @@ RUN set -ex; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | i386 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
apt-get update; \ apt-get update; \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from their published source packages # let's build binaries from their published source packages
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
\ \
tempDir="$(mktemp -d)"; \ tempDir="$(mktemp -d)"; \
cd "$tempDir"; \ cd "$tempDir"; \

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

10
9.6/buster/Dockerfile → 9.6/bullseye/Dockerfile generated
View File

@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY. # PLEASE DO NOT EDIT IT DIRECTLY.
# #
FROM debian:buster-slim FROM debian:bullseye-slim
RUN set -ex; \ RUN set -ex; \
if ! command -v gpg > /dev/null; then \ if ! command -v gpg > /dev/null; then \
@ -90,7 +90,7 @@ RUN set -ex; \
ENV PG_MAJOR 9.6 ENV PG_MAJOR 9.6
ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PG_VERSION 9.6.23-1.pgdg100+1 ENV PG_VERSION 9.6.23-1.pgdg110+1
RUN set -ex; \ RUN set -ex; \
\ \
@ -99,15 +99,15 @@ RUN set -ex; \
\ \
dpkgArch="$(dpkg --print-architecture)"; \ dpkgArch="$(dpkg --print-architecture)"; \
case "$dpkgArch" in \ case "$dpkgArch" in \
amd64 | arm64 | i386 | ppc64el) \ amd64 | arm64 | ppc64el) \
# arches officialy built by upstream # arches officialy built by upstream
echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
apt-get update; \ apt-get update; \
;; \ ;; \
*) \ *) \
# we're on an architecture upstream doesn't officially build for # we're on an architecture upstream doesn't officially build for
# let's build binaries from their published source packages # let's build binaries from their published source packages
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \ echo "deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
\ \
tempDir="$(mktemp -d)"; \ tempDir="$(mktemp -d)"; \
cd "$tempDir"; \ cd "$tempDir"; \

0
9.6/buster/docker-entrypoint.sh → 9.6/bullseye/docker-entrypoint.sh generated
View File

2
apply-templates.sh
View File

@ -37,6 +37,8 @@ for version; do
variants="$(jq -r '.[env.version].debianSuites + ["alpine"] | map(@sh) | join(" ")' versions.json)" variants="$(jq -r '.[env.version].debianSuites + ["alpine"] | map(@sh) | join(" ")' versions.json)"
eval "variants=( $variants )" eval "variants=( $variants )"
rm -rf "$version"
for variant in "${variants[@]}"; do for variant in "${variants[@]}"; do
export variant export variant

48
versions.json
View File

@ -1,18 +1,17 @@
{ {
"10": { "10": {
"alpine": "3.14", "alpine": "3.14",
"buster": { "bullseye": {
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"i386",
"ppc64el" "ppc64el"
], ],
"version": "10.18-1.pgdg100+1" "version": "10.18-1.pgdg110+1"
}, },
"debian": "stretch", "debian": "stretch",
"debianSuites": [ "debianSuites": [
"buster", "bullseye",
"stretch" "stretch"
], ],
"major": 10, "major": 10,
@ -29,18 +28,17 @@
}, },
"11": { "11": {
"alpine": "3.14", "alpine": "3.14",
"buster": { "bullseye": {
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"i386",
"ppc64el" "ppc64el"
], ],
"version": "11.13-1.pgdg100+1" "version": "11.13-1.pgdg110+1"
}, },
"debian": "stretch", "debian": "stretch",
"debianSuites": [ "debianSuites": [
"buster", "bullseye",
"stretch" "stretch"
], ],
"major": 11, "major": 11,
@ -57,18 +55,17 @@
}, },
"12": { "12": {
"alpine": "3.14", "alpine": "3.14",
"buster": { "bullseye": {
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"i386",
"ppc64el" "ppc64el"
], ],
"version": "12.8-1.pgdg100+1" "version": "12.8-1.pgdg110+1"
}, },
"debian": "buster", "debian": "bullseye",
"debianSuites": [ "debianSuites": [
"buster" "bullseye"
], ],
"major": 12, "major": 12,
"sha256": "e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a", "sha256": "e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a",
@ -76,18 +73,17 @@
}, },
"13": { "13": {
"alpine": "3.14", "alpine": "3.14",
"buster": { "bullseye": {
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"i386",
"ppc64el" "ppc64el"
], ],
"version": "13.4-1.pgdg100+1" "version": "13.4-1.pgdg110+1"
}, },
"debian": "buster", "debian": "bullseye",
"debianSuites": [ "debianSuites": [
"buster" "bullseye"
], ],
"major": 13, "major": 13,
"sha256": "ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd", "sha256": "ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd",
@ -95,18 +91,17 @@
}, },
"14": { "14": {
"alpine": "3.14", "alpine": "3.14",
"buster": { "bullseye": {
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"i386",
"ppc64el" "ppc64el"
], ],
"version": "14~beta3-1.pgdg100+1" "version": "14~beta3-1.pgdg110+1"
}, },
"debian": "buster", "debian": "bullseye",
"debianSuites": [ "debianSuites": [
"buster" "bullseye"
], ],
"major": 14, "major": 14,
"sha256": "2ea265980193db70106576201a2fee5b2d72bf9890d3911ddd374d4830624bfa", "sha256": "2ea265980193db70106576201a2fee5b2d72bf9890d3911ddd374d4830624bfa",
@ -114,18 +109,17 @@
}, },
"9.6": { "9.6": {
"alpine": "3.14", "alpine": "3.14",
"buster": { "bullseye": {
"arches": [ "arches": [
"amd64", "amd64",
"arm64", "arm64",
"i386",
"ppc64el" "ppc64el"
], ],
"version": "9.6.23-1.pgdg100+1" "version": "9.6.23-1.pgdg110+1"
}, },
"debian": "stretch", "debian": "stretch",
"debianSuites": [ "debianSuites": [
"buster", "bullseye",
"stretch" "stretch"
], ],
"major": 9, "major": 9,

6
versions.sh
View File

@ -2,14 +2,14 @@
set -Eeuo pipefail set -Eeuo pipefail
# https://github.com/docker-library/postgres/issues/582 😬 # https://github.com/docker-library/postgres/issues/582 😬
defaultDebianSuite='buster' defaultDebianSuite='bullseye'
declare -A debianSuites=( declare -A debianSuites=(
[9.6]='stretch' [9.6]='stretch'
[10]='stretch' [10]='stretch'
[11]='stretch' [11]='stretch'
) )
allDebianSuites=( allDebianSuites=(
buster bullseye
stretch stretch
) )
defaultAlpineVersion='3.14' defaultAlpineVersion='3.14'
@ -89,7 +89,7 @@ for version in "${versions[@]}"; do
for suite in "${allDebianSuites[@]}"; do for suite in "${allDebianSuites[@]}"; do
versionDebianSuites+=( "$suite" ) versionDebianSuites+=( "$suite" )
if [ "$suite" = "$versionDebianSuite" ]; then if [ "$suite" = "$versionDebianSuite" ]; then
# if our default is "buster" we shouldn't even consider "stretch" # if our default is newer than stretch we shouldn't even consider providing stretch
break break
fi fi
done done