From ee18d45d0721690812ce53f5bc071b4233b0c0a7 Mon Sep 17 00:00:00 2001 From: bfren Date: Sat, 6 Dec 2025 09:14:34 +0000 Subject: [PATCH 1/4] Bumping version to 4.1.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 99eba4d..2582ddd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0 \ No newline at end of file +4.1.1 \ No newline at end of file From bbbc18c6cb751aa1e26e8b7b92e078b7641500a1 Mon Sep 17 00:00:00 2001 From: bfren Date: Sat, 6 Dec 2025 09:15:48 +0000 Subject: [PATCH 2/4] Adding support for PostgreSQL 18 --- .github/workflows/dev.yml | 2 +- .github/workflows/publish.yml | 2 +- 18/Dockerfile | 22 ++++++++++++++++++++++ 18/overlay/tmp/POSTGRESQL_BUILD | 1 + 18/overlay/tmp/POSTGRESQL_MINOR | 1 + generate-dockerfiles.sh | 2 +- run.sh | 2 +- test.sh | 2 +- 8 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 18/Dockerfile create mode 100644 18/overlay/tmp/POSTGRESQL_BUILD create mode 100644 18/overlay/tmp/POSTGRESQL_MINOR diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 71f594b..6b00892 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - postgresql: [ "12", "13", "14", "15", "16", "17" ] + postgresql: [ "12", "13", "14", "15", "16", "17", "18" ] runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6e4e303..e5e5138 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - postgresql: [ "12", "13", "14", "15", "16", "17" ] + postgresql: [ "12", "13", "14", "15", "16", "17", "18" ] runs-on: ubuntu-latest steps: - diff --git a/18/Dockerfile b/18/Dockerfile new file mode 100644 index 0000000..2c4dc64 --- /dev/null +++ b/18/Dockerfile @@ -0,0 +1,22 @@ +FROM quay.io/bfren/alpine-s6:alpine3.23-6.1.0 + +LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" + +ARG BF_IMAGE +ARG BF_PUBLISHING +ARG BF_VERSION + +EXPOSE 5432 + +COPY ./overlay / +COPY ./17/overlay / + +ENV \ + # set to "1" to compress backup sql files + BF_PG_BACKUP_COMPRESS_FILES="0" \ + # the duration for which backups will be kept + BF_PG_BACKUP_KEEP_FOR="28day" + +RUN bf-install + +VOLUME [ "/backup", "/data" ] diff --git a/18/overlay/tmp/POSTGRESQL_BUILD b/18/overlay/tmp/POSTGRESQL_BUILD new file mode 100644 index 0000000..9855a0a --- /dev/null +++ b/18/overlay/tmp/POSTGRESQL_BUILD @@ -0,0 +1 @@ +18.1-r0 \ No newline at end of file diff --git a/18/overlay/tmp/POSTGRESQL_MINOR b/18/overlay/tmp/POSTGRESQL_MINOR new file mode 100644 index 0000000..9dc4015 --- /dev/null +++ b/18/overlay/tmp/POSTGRESQL_MINOR @@ -0,0 +1 @@ +18.1 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index db70f61..a338330 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -7,7 +7,7 @@ docker pull bfren/alpine BASE_VERSION="6.1.0" echo "Base: ${BASE_VERSION}" -POSTGRESQL_VERSIONS="12 13 14 15 16 17" +POSTGRESQL_VERSIONS="12 13 14 15 16 17 18" for V in ${POSTGRESQL_VERSIONS} ; do echo "PostgreSQL ${V}" diff --git a/run.sh b/run.sh index 357ec4b..366ae1e 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,7 @@ #!/bin/sh IMAGE=`cat VERSION` -POSTGRESQL=${1:-17} +POSTGRESQL=${1:-18} docker buildx build \ --load \ diff --git a/test.sh b/test.sh index b8523b4..7ad3b61 100644 --- a/test.sh +++ b/test.sh @@ -2,7 +2,7 @@ IMAGE=postgresql VERSION=`cat VERSION` -POSTGRESQL=${1:-17} +POSTGRESQL=${1:-18} TAG=${IMAGE}-test docker buildx build \ From 88820fee5c23aa7d3643468b88455b76f6f00f53 Mon Sep 17 00:00:00 2001 From: bfren Date: Sat, 6 Dec 2025 09:16:06 +0000 Subject: [PATCH 3/4] Bumping version to 4.2.0 --- VERSION | 2 +- VERSION_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2582ddd..ef8d756 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.1 \ No newline at end of file +4.2.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 8a36cd1..8012ebb 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -4.1 \ No newline at end of file +4.2 \ No newline at end of file From 467bf206c786dac9e7ad01e60cc9c81ad76c452c Mon Sep 17 00:00:00 2001 From: bfren Date: Sat, 6 Dec 2025 09:17:17 +0000 Subject: [PATCH 4/4] Adding PostgreSQL 17 and 18 to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 150a2ff..d22a021 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [Docker Repository](https://hub.docker.com/r/bfren/postgresql) - [bfren ecosystem](https://github.com/bfren/docker) -[PostgreSQL](https://www.postgresql.org/) comes pre-installed (12, 13, 14, 15 or 16) with automatic backups built-in. +[PostgreSQL](https://www.postgresql.org/) comes pre-installed (12, 13, 14, 15, 16, 17 and 18) with automatic backups built-in. ## Contents