feat: add PostgreSQL18beta3 test postgis image

thomasboussekey · thomasboussekey · commit 353c5fbc6af1 · 2025-09-03T20:23:45.000+02:00
Signed-off-by: thomas.boussekey &lt;thomas.boussekey@mirakl.com&gt;
diff --git a/PostGIS/13/.versions.json b/PostGIS/13/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.14.0",
-  "IMAGE_RELEASE_VERSION": "192",
+  "IMAGE_RELEASE_VERSION": "193",
   "POSTGIS_IMAGE_LAST_UPDATED": "2025-09-01T05:33:05.669258Z",
   "POSTGIS_IMAGE_VERSION": "13-3.5"
 }
diff --git a/PostGIS/13/Dockerfile b/PostGIS/13/Dockerfile
@@ -19,7 +19,7 @@ FROM postgis/postgis:13-3.5
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="The CloudNativePG Contributors" \
       version="${PG_VERSION}" \
-      release="192" \
+      release="193" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on Postgres 13-3.5."
 
diff --git a/PostGIS/13/requirements.txt b/PostGIS/13/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
 #    pip-compile --generate-hashes
@@ -575,9 +575,9 @@ typing-extensions==4.15.0 \
     #   azure-core
     #   azure-identity
     #   azure-storage-blob
-urllib3==1.26.20 \
-    --hash=sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e \
-    --hash=sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32
+urllib3==2.5.0 \
+    --hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
+    --hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
     # via
     #   botocore
     #   requests
diff --git a/PostGIS/14/.versions.json b/PostGIS/14/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.14.0",
-  "IMAGE_RELEASE_VERSION": "192",
+  "IMAGE_RELEASE_VERSION": "193",
   "POSTGIS_IMAGE_LAST_UPDATED": "2025-09-01T05:33:57.559467Z",
   "POSTGIS_IMAGE_VERSION": "14-3.5"
 }
diff --git a/PostGIS/14/Dockerfile b/PostGIS/14/Dockerfile
@@ -19,7 +19,7 @@ FROM postgis/postgis:14-3.5
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="The CloudNativePG Contributors" \
       version="${PG_VERSION}" \
-      release="192" \
+      release="193" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on Postgres 14-3.5."
 
diff --git a/PostGIS/14/requirements.txt b/PostGIS/14/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
 #    pip-compile --generate-hashes
@@ -575,9 +575,9 @@ typing-extensions==4.15.0 \
     #   azure-core
     #   azure-identity
     #   azure-storage-blob
-urllib3==1.26.20 \
-    --hash=sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e \
-    --hash=sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32
+urllib3==2.5.0 \
+    --hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
+    --hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
     # via
     #   botocore
     #   requests
diff --git a/PostGIS/15/.versions.json b/PostGIS/15/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.14.0",
-  "IMAGE_RELEASE_VERSION": "192",
+  "IMAGE_RELEASE_VERSION": "193",
   "POSTGIS_IMAGE_LAST_UPDATED": "2025-09-01T05:33:10.177472Z",
   "POSTGIS_IMAGE_VERSION": "15-3.5"
 }
diff --git a/PostGIS/15/Dockerfile b/PostGIS/15/Dockerfile
@@ -19,7 +19,7 @@ FROM postgis/postgis:15-3.5
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="The CloudNativePG Contributors" \
       version="${PG_VERSION}" \
-      release="192" \
+      release="193" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on Postgres 15-3.5."
 
diff --git a/PostGIS/15/requirements.txt b/PostGIS/15/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
 #    pip-compile --generate-hashes
@@ -575,9 +575,9 @@ typing-extensions==4.15.0 \
     #   azure-core
     #   azure-identity
     #   azure-storage-blob
-urllib3==1.26.20 \
-    --hash=sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e \
-    --hash=sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32
+urllib3==2.5.0 \
+    --hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
+    --hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
     # via
     #   botocore
     #   requests
diff --git a/PostGIS/16/.versions.json b/PostGIS/16/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.14.0",
-  "IMAGE_RELEASE_VERSION": "192",
+  "IMAGE_RELEASE_VERSION": "193",
   "POSTGIS_IMAGE_LAST_UPDATED": "2025-09-01T05:33:25.113119Z",
   "POSTGIS_IMAGE_VERSION": "16-3.5"
 }
diff --git a/PostGIS/16/Dockerfile b/PostGIS/16/Dockerfile
@@ -19,7 +19,7 @@ FROM postgis/postgis:16-3.5
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="The CloudNativePG Contributors" \
       version="${PG_VERSION}" \
-      release="192" \
+      release="193" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on Postgres 16-3.5."
 
diff --git a/PostGIS/16/requirements.txt b/PostGIS/16/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
 #    pip-compile --generate-hashes
@@ -575,9 +575,9 @@ typing-extensions==4.15.0 \
     #   azure-core
     #   azure-identity
     #   azure-storage-blob
-urllib3==1.26.20 \
-    --hash=sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e \
-    --hash=sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32
+urllib3==2.5.0 \
+    --hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
+    --hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
     # via
     #   botocore
     #   requests
diff --git a/PostGIS/17/.versions.json b/PostGIS/17/.versions.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.14.0",
-  "IMAGE_RELEASE_VERSION": "192",
+  "IMAGE_RELEASE_VERSION": "193",
   "POSTGIS_IMAGE_LAST_UPDATED": "2025-09-01T05:33:01.715091Z",
   "POSTGIS_IMAGE_VERSION": "17-3.5"
 }
diff --git a/PostGIS/17/Dockerfile b/PostGIS/17/Dockerfile
@@ -19,7 +19,7 @@ FROM postgis/postgis:17-3.5
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="The CloudNativePG Contributors" \
       version="${PG_VERSION}" \
-      release="192" \
+      release="193" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on Postgres 17-3.5."
 
diff --git a/PostGIS/17/requirements.txt b/PostGIS/17/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
 #    pip-compile --generate-hashes
@@ -575,9 +575,9 @@ typing-extensions==4.15.0 \
     #   azure-core
     #   azure-identity
     #   azure-storage-blob
-urllib3==1.26.20 \
-    --hash=sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e \
-    --hash=sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32
+urllib3==2.5.0 \
+    --hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
+    --hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
     # via
     #   botocore
     #   requests
diff --git a/PostGIS/18/.versions.json b/PostGIS/18/.versions.json
@@ -0,0 +1,6 @@
+{
+  "BARMAN_VERSION": "3.14.0",
+  "IMAGE_RELEASE_VERSION": "1",
+  "POSTGIS_IMAGE_LAST_UPDATED": "2025-09-03T05:33:01.715091Z",
+  "POSTGIS_IMAGE_VERSION": "18beta3-3.6"
+}
diff --git a/PostGIS/18/Dockerfile b/PostGIS/18/Dockerfile
@@ -0,0 +1,61 @@
+#
+# Copyright The CloudNativePG Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+FROM postgis/postgis:17-3.5
+
+# Do not split the description, otherwise we will see a blank space in the labels
+LABEL name="PostgreSQL + PostGIS Container Images" \
+      vendor="The CloudNativePG Contributors" \
+      version="${PG_VERSION}" \
+      release="192" \
+      summary="PostgreSQL + PostGIS Container images." \
+      description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on Postgres 17-3.5."
+
+LABEL org.opencontainers.image.description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on Postgres 17-3.5."
+
+COPY requirements.txt /
+
+# Install additional extensions
+RUN set -xe; \
+	apt-get update; \
+	if apt-get -s upgrade | grep "^Inst postgres"; then \
+		echo "ERROR: Upgradable postgres packages found!"; \
+		apt-get -s upgrade | grep "^Inst postgres"; \
+		exit 1; \
+	fi; \
+	apt-get install -y --no-install-recommends \
+		"postgresql-${PG_MAJOR}-pgaudit" \
+		"postgresql-${PG_MAJOR}-pg-failover-slots" \
+		"postgresql-${PG_MAJOR}-pgrouting" \
+	; \
+	rm -fr /tmp/* ; \
+	rm -rf /var/lib/apt/lists/*;
+
+# Install barman-cloud
+RUN set -xe; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		python3-pip \
+		python3-psycopg2 \
+		python3-setuptools \
+	; \
+	pip3 install --upgrade pip; \
+# TODO: Remove --no-deps once https://github.com/pypa/pip/issues/9644 is solved
+	pip3 install --no-deps -r requirements.txt; \
+	rm -rf /var/lib/apt/lists/*;
+
+# Change the uid of postgres to 26
+RUN usermod -u 26 postgres
+USER 26
diff --git a/PostGIS/18/requirements.txt b/PostGIS/18/requirements.txt
diff --git a/PostGIS/src/requirements.txt b/PostGIS/src/requirements.txt
diff --git a/PostGIS/update.sh b/PostGIS/update.sh

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"BARMAN_VERSION": "3.14.0",`
`3`		`- "IMAGE_RELEASE_VERSION": "192",`
	`3`	`+ "IMAGE_RELEASE_VERSION": "193",`
`4`	`4`	`"POSTGIS_IMAGE_LAST_UPDATED": "2025-09-01T05:33:05.669258Z",`
`5`	`5`	`"POSTGIS_IMAGE_VERSION": "13-3.5"`
`6`	`6`	`}`