From 57459368218c62f64d84d4728270a13a6f856f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Fei?= Date: Wed, 9 Jul 2025 15:07:44 +0200 Subject: [PATCH 1/2] feat: add v18 beta images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Niccolò Fei --- Debian/18/bookworm/.versions.json | 6 ++++++ Debian/18/bullseye/.versions.json | 6 ++++++ Debian/Dockerfile-beta.template | 14 +++++++------- README.md | 2 +- lib/repo_funcs.sh | 1 + 5 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 Debian/18/bookworm/.versions.json create mode 100644 Debian/18/bullseye/.versions.json diff --git a/Debian/18/bookworm/.versions.json b/Debian/18/bookworm/.versions.json new file mode 100644 index 00000000..a55ddc5e --- /dev/null +++ b/Debian/18/bookworm/.versions.json @@ -0,0 +1,6 @@ +{ + "BARMAN_VERSION": "3.14.0", + "IMAGE_RELEASE_VERSION": "1", + "POSTGRES_IMAGE_LAST_UPDATED": "2025-07-01T14:09:06.900678Z", + "POSTGRES_IMAGE_VERSION": "18beta1-bookworm" +} diff --git a/Debian/18/bullseye/.versions.json b/Debian/18/bullseye/.versions.json new file mode 100644 index 00000000..5db8b73c --- /dev/null +++ b/Debian/18/bullseye/.versions.json @@ -0,0 +1,6 @@ +{ + "BARMAN_VERSION": "3.14.0", + "IMAGE_RELEASE_VERSION": "1", + "POSTGRES_IMAGE_LAST_UPDATED": "2025-07-01T08:11:13.699314Z", + "POSTGRES_IMAGE_VERSION": "18beta1-bullseye" +} diff --git a/Debian/Dockerfile-beta.template b/Debian/Dockerfile-beta.template index 6a456475..9dc79c89 100644 --- a/Debian/Dockerfile-beta.template +++ b/Debian/Dockerfile-beta.template @@ -28,13 +28,13 @@ LABEL org.opencontainers.image.description="This Docker image contains PostgreSQ COPY requirements.txt / # Install additional extensions -RUN set -xe; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - "postgresql-${PG_MAJOR}-pgvector" \ - ; \ - rm -fr /tmp/* ; \ - rm -rf /var/lib/apt/lists/*; +# RUN set -xe; \ +# apt-get update; \ +# apt-get install -y --no-install-recommends \ +# "postgresql-${PG_MAJOR}-pgvector" \ +# ; \ +# rm -fr /tmp/* ; \ +# rm -rf /var/lib/apt/lists/*; # Install barman-cloud RUN set -xe; \ diff --git a/README.md b/README.md index 5e1fea6a..60ccd7e4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ # CNPG PostgreSQL Container Images This repository provides maintenance scripts for generating immutable -application containers for all supported PostgreSQL versions (13 to 17). +application containers for all supported PostgreSQL versions (13 to 18). These containers are designed to serve as operands for the [CloudNativePG (CNPG) operator](https://cloudnative-pg.io) in Kubernetes environments. diff --git a/lib/repo_funcs.sh b/lib/repo_funcs.sh index 2afddd3f..a9172298 100644 --- a/lib/repo_funcs.sh +++ b/lib/repo_funcs.sh @@ -97,6 +97,7 @@ generate_postgres() { fi # Update requirements.txt + mkdir -p "$versionDir" echo "$requirements" > "$versionDir/requirements.txt" # Output the image being updated From a3b3919d8e97c34e85fedca7f9654f756b6e97b2 Mon Sep 17 00:00:00 2001 From: Gabriele Bartolini Date: Thu, 10 Jul 2025 10:18:35 +0200 Subject: [PATCH 2/2] docs: clarify that 18 is only beta Signed-off-by: Gabriele Bartolini --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 60ccd7e4..e4597bf6 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,13 @@ # CNPG PostgreSQL Container Images -This repository provides maintenance scripts for generating immutable -application containers for all supported PostgreSQL versions (13 to 18). -These containers are designed to serve as operands for the -[CloudNativePG (CNPG) operator](https://cloudnative-pg.io) in Kubernetes -environments. +This repository provides maintenance scripts for generating **immutable +application containers** for all supported PostgreSQL versions (13 to 17), +as well as for PostgreSQL 18 beta. + +These containers are designed to serve as **operands** for the +[CloudNativePG (CNPG) operator](https://cloudnative-pg.io) +within Kubernetes environments. ## Key Features