Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from Buster to Bullseye #879

Merged
merged 1 commit into from
Sep 21, 2021
Merged

Update from Buster to Bullseye #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions 10/buster/Dockerfile → 10/bullseye/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 10/buster/docker-entrypoint.sh → 10/bullseye/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions 11/buster/Dockerfile → 11/bullseye/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 11/buster/docker-entrypoint.sh → 11/bullseye/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions 12/buster/Dockerfile → 12/bullseye/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 12/buster/docker-entrypoint.sh → 12/bullseye/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions 13/buster/Dockerfile → 13/bullseye/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 13/buster/docker-entrypoint.sh → 13/bullseye/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions 14/buster/Dockerfile → 14/bullseye/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 14/buster/docker-entrypoint.sh → 14/bullseye/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions 9.6/buster/Dockerfile → 9.6/bullseye/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 9.6/buster/docker-entrypoint.sh → 9.6/bullseye/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions apply-templates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ for version; do
variants="$(jq -r '.[env.version].debianSuites + ["alpine"] | map(@sh) | join(" ")' versions.json)"
eval "variants=( $variants )"

rm -rf "$version"

for variant in "${variants[@]}"; do
export variant

Expand Down
48 changes: 21 additions & 27 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
{
"10": {
"alpine": "3.14",
"buster": {
"bullseye": {
"arches": [
"amd64",
"arm64",
"i386",
"ppc64el"
],
"version": "10.18-1.pgdg100+1"
"version": "10.18-1.pgdg110+1"
},
"debian": "stretch",
"debianSuites": [
"buster",
"bullseye",
"stretch"
],
"major": 10,
Expand All @@ -29,18 +28,17 @@
},
"11": {
"alpine": "3.14",
"buster": {
"bullseye": {
"arches": [
"amd64",
"arm64",
"i386",
"ppc64el"
],
"version": "11.13-1.pgdg100+1"
"version": "11.13-1.pgdg110+1"
},
"debian": "stretch",
"debianSuites": [
"buster",
"bullseye",
"stretch"
],
"major": 11,
Expand All @@ -57,75 +55,71 @@
},
"12": {
"alpine": "3.14",
"buster": {
"bullseye": {
"arches": [
"amd64",
"arm64",
"i386",
"ppc64el"
],
"version": "12.8-1.pgdg100+1"
"version": "12.8-1.pgdg110+1"
},
"debian": "buster",
"debian": "bullseye",
"debianSuites": [
"buster"
"bullseye"
],
"major": 12,
"sha256": "e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a",
"version": "12.8"
},
"13": {
"alpine": "3.14",
"buster": {
"bullseye": {
"arches": [
"amd64",
"arm64",
"i386",
"ppc64el"
],
"version": "13.4-1.pgdg100+1"
"version": "13.4-1.pgdg110+1"
},
"debian": "buster",
"debian": "bullseye",
"debianSuites": [
"buster"
"bullseye"
],
"major": 13,
"sha256": "ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd",
"version": "13.4"
},
"14": {
"alpine": "3.14",
"buster": {
"bullseye": {
"arches": [
"amd64",
"arm64",
"i386",
"ppc64el"
],
"version": "14~beta3-1.pgdg100+1"
"version": "14~beta3-1.pgdg110+1"
},
"debian": "buster",
"debian": "bullseye",
"debianSuites": [
"buster"
"bullseye"
],
"major": 14,
"sha256": "2ea265980193db70106576201a2fee5b2d72bf9890d3911ddd374d4830624bfa",
"version": "14beta3"
},
"9.6": {
"alpine": "3.14",
"buster": {
"bullseye": {
"arches": [
"amd64",
"arm64",
"i386",
"ppc64el"
],
"version": "9.6.23-1.pgdg100+1"
"version": "9.6.23-1.pgdg110+1"
},
"debian": "stretch",
"debianSuites": [
"buster",
"bullseye",
"stretch"
],
"major": 9,
Expand Down
6 changes: 3 additions & 3 deletions versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
set -Eeuo pipefail

# https://github.com/docker-library/postgres/issues/582 😬
defaultDebianSuite='buster'
defaultDebianSuite='bullseye'
declare -A debianSuites=(
[9.6]='stretch'
[10]='stretch'
[11]='stretch'
)
allDebianSuites=(
buster
bullseye
stretch
)
defaultAlpineVersion='3.14'
Expand Down Expand Up @@ -89,7 +89,7 @@ for version in "${versions[@]}"; do
for suite in "${allDebianSuites[@]}"; do
versionDebianSuites+=( "$suite" )
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
fi
done
Expand Down