Merge pull request #879 from infosiftr/bullseye

Update from Buster to Bullseye

Author: yosifkit

10/buster/Dockerfile 10/bullseye/Dockerfile

@@ -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
 

10/buster/docker-entrypoint.sh 10/bullseye/docker-entrypoint.sh

@@ -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,
@@ -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,
@@ -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,

11/buster/Dockerfile 11/bullseye/Dockerfile

@@ -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'
@@ -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