Merge pull request #53 from ImreSamu/update_17rc1

upgrade to 17rc1
ImreSamu · Sep 7, 2024 · 036ebd3 · 036ebd3
2 parents 89a4372 + 5a781d4
commit 036ebd3
Show file tree

Hide file tree

Showing 23 changed files with 70 additions and 71 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -155,8 +155,8 @@ workflows:
                 "16-3.4-bundle0-bookworm",
                 "16-master-bookworm",
                 "16-recent-bookworm",
-                "17beta3-3.4-alpine3.20",
-                "17beta3-master-bookworm",
-                "17beta3-recent-bookworm",
+                "17rc1-3.4-alpine3.20",
+                "17rc1-master-bookworm",
+                "17rc1-recent-bookworm",
 #circleci-targets-end
               ]
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile
diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile
diff --git a/17beta3-3.4/alpine3.20/tags b/17beta3-3.4/alpine3.20/tags
diff --git a/17beta3-master/bookworm/tags b/17beta3-master/bookworm/tags
diff --git a/17beta3-recent/bookworm/tags b/17beta3-recent/bookworm/tags
diff --git a/17beta3-3.4/alpine3.20/Dockerfile → 17rc1-3.4/alpine3.20/Dockerfile b/17beta3-3.4/alpine3.20/Dockerfile → 17rc1-3.4/alpine3.20/Dockerfile
diff --git a/17beta3-3.4/alpine3.20/initdb-postgis.sh → 17rc1-3.4/alpine3.20/initdb-postgis.sh b/17beta3-3.4/alpine3.20/initdb-postgis.sh → 17rc1-3.4/alpine3.20/initdb-postgis.sh
diff --git a/17rc1-3.4/alpine3.20/tags b/17rc1-3.4/alpine3.20/tags
diff --git a/17beta3-3.4/alpine3.20/update-postgis.sh → 17rc1-3.4/alpine3.20/update-postgis.sh b/17beta3-3.4/alpine3.20/update-postgis.sh → 17rc1-3.4/alpine3.20/update-postgis.sh
diff --git a/17beta3-master/bookworm/Dockerfile → 17rc1-master/bookworm/Dockerfile b/17beta3-master/bookworm/Dockerfile → 17rc1-master/bookworm/Dockerfile
diff --git a/17beta3-master/bookworm/initdb-postgis.sh → 17rc1-master/bookworm/initdb-postgis.sh b/17beta3-master/bookworm/initdb-postgis.sh → 17rc1-master/bookworm/initdb-postgis.sh
diff --git a/17rc1-master/bookworm/tags b/17rc1-master/bookworm/tags
diff --git a/17beta3-master/bookworm/update-postgis.sh → 17rc1-master/bookworm/update-postgis.sh b/17beta3-master/bookworm/update-postgis.sh → 17rc1-master/bookworm/update-postgis.sh
diff --git a/17beta3-recent/bookworm/Dockerfile → 17rc1-recent/bookworm/Dockerfile b/17beta3-recent/bookworm/Dockerfile → 17rc1-recent/bookworm/Dockerfile
diff --git a/17beta3-recent/bookworm/initdb-postgis.sh → 17rc1-recent/bookworm/initdb-postgis.sh b/17beta3-recent/bookworm/initdb-postgis.sh → 17rc1-recent/bookworm/initdb-postgis.sh
diff --git a/17rc1-recent/bookworm/tags b/17rc1-recent/bookworm/tags
diff --git a/17beta3-recent/bookworm/update-postgis.sh → 17rc1-recent/bookworm/update-postgis.sh b/17beta3-recent/bookworm/update-postgis.sh → 17rc1-recent/bookworm/update-postgis.sh
diff --git a/README.md b/README.md
diff --git a/manifest.sh b/manifest.sh
@@ -610,62 +610,62 @@ manifest-tool push from-args \
     --template ${dockername}-ARCHVARIANT:recent \
     --target ${dockername}:recent || true
 
-# ----- 17beta3-3.4-alpine3.20 -----
+# ----- 17rc1-3.4-alpine3.20 -----
 
-echo "manifest: ${dockername}:17beta3-3.4-alpine3.20"
+echo "manifest: ${dockername}:17rc1-3.4-alpine3.20"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine3.20 \
-    --target ${dockername}:17beta3-3.4-alpine3.20 || true
+    --template ${dockername}-ARCHVARIANT:17rc1-3.4-alpine3.20 \
+    --target ${dockername}:17rc1-3.4-alpine3.20 || true
 
-echo "manifest: ${dockername}:17beta3-3.4.3-alpine3.20"
+echo "manifest: ${dockername}:17rc1-3.4.3-alpine3.20"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:17beta3-3.4.3-alpine3.20 \
-    --target ${dockername}:17beta3-3.4.3-alpine3.20 || true
+    --template ${dockername}-ARCHVARIANT:17rc1-3.4.3-alpine3.20 \
+    --target ${dockername}:17rc1-3.4.3-alpine3.20 || true
 
-echo "manifest: ${dockername}:17beta3-3.4-alpine"
+echo "manifest: ${dockername}:17rc1-3.4-alpine"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine \
-    --target ${dockername}:17beta3-3.4-alpine || true
+    --template ${dockername}-ARCHVARIANT:17rc1-3.4-alpine \
+    --target ${dockername}:17rc1-3.4-alpine || true
 
-# ----- 17beta3-master-bookworm -----
+# ----- 17rc1-master-bookworm -----
 
-echo "manifest: ${dockername}:17beta3-master-bookworm"
+echo "manifest: ${dockername}:17rc1-master-bookworm"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:17beta3-master-bookworm \
-    --target ${dockername}:17beta3-master-bookworm || true
+    --template ${dockername}-ARCHVARIANT:17rc1-master-bookworm \
+    --target ${dockername}:17rc1-master-bookworm || true
 
-echo "manifest: ${dockername}:17beta3-master"
+echo "manifest: ${dockername}:17rc1-master"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:17beta3-master \
-    --target ${dockername}:17beta3-master || true
+    --template ${dockername}-ARCHVARIANT:17rc1-master \
+    --target ${dockername}:17rc1-master || true
 
-# ----- 17beta3-recent-bookworm -----
+# ----- 17rc1-recent-bookworm -----
 
-echo "manifest: ${dockername}:17beta3-recent-bookworm"
+echo "manifest: ${dockername}:17rc1-recent-bookworm"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:17beta3-recent-bookworm \
-    --target ${dockername}:17beta3-recent-bookworm || true
+    --template ${dockername}-ARCHVARIANT:17rc1-recent-bookworm \
+    --target ${dockername}:17rc1-recent-bookworm || true
 
-echo "manifest: ${dockername}:17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm"
+echo "manifest: ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \
-    --target ${dockername}:17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true
+    --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \
+    --target ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true
 
-echo "manifest: ${dockername}:17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm"
+echo "manifest: ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \
-    --target ${dockername}:17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true
+    --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \
+    --target ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true
 
-echo "manifest: ${dockername}:17beta3-recent"
+echo "manifest: ${dockername}:17rc1-recent"
 manifest-tool push from-args \
     --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:17beta3-recent \
-    --target ${dockername}:17beta3-recent || true
+    --template ${dockername}-ARCHVARIANT:17rc1-recent \
+    --target ${dockername}:17rc1-recent || true
diff --git a/versions.json b/versions.json
diff --git a/versions.sh b/versions.sh
@@ -25,19 +25,17 @@ alpine_latest="alpine3.20"
 postgis_latest="3.4"
 postgres_latest="16"
 postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5"
-postgres_versions="11 12 13 14 15 16 17beta3"
+postgres_versions="11 12 13 14 15 16 17rc1"
 
 # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically
 #   if not set, it will use the locked version, and the checkout hash will be used
 MASTER_BRANCH_MODE="flexible"
 
 POSTGIS_BRANCH="master"
-#GEOS_BRANCH="main"
-GEOS_BRANCH="3.12"
+GEOS_BRANCH="main"
 GDAL_BRANCH="master"
 PROJ_BRANCH="master"
 SFCGAL_BRANCH="master"
-#CGAL_BRANCH="5.6.x-branch"
 CGAL_BRANCH="master"
 
 # locked:  extra locking versions for dependencies
@@ -724,6 +722,7 @@ for version in "${versions[@]}"; do
 
                 postgisDockerTag="${postgisLastDockerTags[$postgisVersion]}"
 
+                echo "postgresVersion=${postgresVersion}"
                 mainTags="${postgresLastMainTags[$postgresVersion]}-${postgisLastDockerTags[$postgisVersion]}"
                 if [[ ${mainTags} =~ [a-zA-Z] ]]; then
                     readme_group="test"