From 4f8cca034c90db083317e72dac9d108d88dd921b Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:41:08 +0000 Subject: [PATCH 1/7] Bumping version to 3.4.6 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3ec370e..4b4ea1b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.4.5 \ No newline at end of file +3.4.6 \ No newline at end of file From 3c29a68fe7f37ea57a7023432706fbc526c1d913 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:41:39 +0000 Subject: [PATCH 2/7] Bumping version to 4.0.0 --- VERSION | 2 +- VERSION_MAJOR | 2 +- VERSION_MINOR | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 4b4ea1b..0c89fc9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.4.6 \ No newline at end of file +4.0.0 \ No newline at end of file diff --git a/VERSION_MAJOR b/VERSION_MAJOR index e440e5c..bf0d87a 100644 --- a/VERSION_MAJOR +++ b/VERSION_MAJOR @@ -1 +1 @@ -3 \ No newline at end of file +4 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index af1817b..389f774 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -3.4 \ No newline at end of file +4.0 \ No newline at end of file From ddc3ea98090034e55f622c505087cac43dc17622 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:41:44 +0000 Subject: [PATCH 3/7] Updating workflow actions --- .github/workflows/auto-pr.yml | 2 +- .github/workflows/dev.yml | 12 ++++++------ .github/workflows/publish.yml | 20 ++++++++++---------- .github/workflows/update-readme.yml | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 54c3776..0d434ac 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Create Pull Request run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}." diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 92d30fb..71f594b 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -43,12 +43,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to GitHub Container Registry + name: Login to Quay.io Container Registry uses: docker/login-action@v3 with: - registry: ghcr.io + registry: quay.io username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.QUAY_TOKEN }} - name: Build and export id: docker_export @@ -80,8 +80,8 @@ jobs: tags: | bfren/postgresql:postgresql${{ matrix.postgresql }}-dev bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev - ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-dev - ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev + quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-dev + quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }}-dev - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index acdd3a6..6e4e303 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -57,12 +57,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to GitHub Container Registry + name: Login to Quay.io Container Registry uses: docker/login-action@v3 with: - registry: ghcr.io + registry: quay.io username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.QUAY_TOKEN }} - name: Build and push id: docker_build @@ -83,12 +83,12 @@ jobs: bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }} bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }} bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }} - ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }} - ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_major.outputs.contents }} - ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_minor.outputs.contents }} - ghcr.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }} - ghcr.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }} - ghcr.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }} + quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }} + quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_major.outputs.contents }} + quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version_minor.outputs.contents }} + quay.io/bfren/postgresql:postgresql${{ matrix.postgresql }}-${{ steps.version.outputs.contents }} + quay.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }} + quay.io/bfren/postgresql:postgresql${{ steps.postgresql_minor.outputs.contents }}-${{ steps.version.outputs.contents }} - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 7fc7506..4e5b4a9 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,7 +15,7 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Login to DockerHub uses: docker/login-action@v3 From a2d243bb155818a7d955353d1399b1bceaedd526 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:41:53 +0000 Subject: [PATCH 4/7] Switching to quay.io --- 12/Dockerfile | 2 +- 13/Dockerfile | 2 +- 14/Dockerfile | 2 +- 15/Dockerfile | 2 +- 16/Dockerfile | 2 +- 17/Dockerfile | 2 +- Dockerfile.esh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/12/Dockerfile b/12/Dockerfile index 7f8fcfd..fb2b3dd 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.18-5.6.7 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/13/Dockerfile b/13/Dockerfile index 6ecd478..dc9519f 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.19-5.6.7 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/14/Dockerfile b/14/Dockerfile index fe47ae3..e3ecf2d 100644 --- a/14/Dockerfile +++ b/14/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.20-5.6.7 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/15/Dockerfile b/15/Dockerfile index af0424f..54e3af9 100644 --- a/15/Dockerfile +++ b/15/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.22-5.6.7 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/16/Dockerfile b/16/Dockerfile index 267d555..2230511 100644 --- a/16/Dockerfile +++ b/16/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.22-5.6.7 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/17/Dockerfile b/17/Dockerfile index a2b573c..aa484d2 100644 --- a/17/Dockerfile +++ b/17/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.22-5.6.7 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/Dockerfile.esh b/Dockerfile.esh index b523609..eb00644 100644 --- a/Dockerfile.esh +++ b/Dockerfile.esh @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %> +FROM quay.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %> LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" From 21982d94b02a98f273dced30d79135fb74703dce Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:42:11 +0000 Subject: [PATCH 5/7] Using crontab add --- overlay/etc/bf/init.d/13-cron.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/etc/bf/init.d/13-cron.nu b/overlay/etc/bf/init.d/13-cron.nu index 90bcd2a..98abf47 100644 --- a/overlay/etc/bf/init.d/13-cron.nu +++ b/overlay/etc/bf/init.d/13-cron.nu @@ -3,4 +3,4 @@ use bf-s6 bf env load # Append backup task to crontab -def main [] { bf-s6 crontab append --min (random int 1..59 | into string) --hour "*/8" "pg-dump" } +def main [] { bf-s6 crontab add --min (random int 1..59 | into string) --hour "*/8" "pg-dump" } From 5cf8f6332b42422441e916b7d58ecad233457379 Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:42:16 +0000 Subject: [PATCH 6/7] Using latest base images --- 12/Dockerfile | 2 +- 13/Dockerfile | 2 +- 14/Dockerfile | 2 +- 15/Dockerfile | 2 +- 16/Dockerfile | 2 +- 17/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/12/Dockerfile b/12/Dockerfile index fb2b3dd..6b2e70e 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/13/Dockerfile b/13/Dockerfile index dc9519f..09c8450 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/14/Dockerfile b/14/Dockerfile index e3ecf2d..31d4e5f 100644 --- a/14/Dockerfile +++ b/14/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/15/Dockerfile b/15/Dockerfile index 54e3af9..6194e95 100644 --- a/15/Dockerfile +++ b/15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/16/Dockerfile b/16/Dockerfile index 2230511..e01de57 100644 --- a/16/Dockerfile +++ b/16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/17/Dockerfile b/17/Dockerfile index aa484d2..6c78695 100644 --- a/17/Dockerfile +++ b/17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 9bf52e1..2f31ced 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="5.6.7" +BASE_VERSION="6.0.1" echo "Base: ${BASE_VERSION}" POSTGRESQL_VERSIONS="12 13 14 15 16 17" From 7e28b0665ca665b8a5935431a04312317d4aa9ed Mon Sep 17 00:00:00 2001 From: bfren Date: Wed, 26 Nov 2025 12:49:11 +0000 Subject: [PATCH 7/7] Updating to PostgreSQL 15.15, 16.11 and 17.7 --- 15/overlay/tmp/POSTGRESQL_BUILD | 2 +- 15/overlay/tmp/POSTGRESQL_MINOR | 2 +- 16/overlay/tmp/POSTGRESQL_BUILD | 2 +- 16/overlay/tmp/POSTGRESQL_MINOR | 2 +- 17/overlay/tmp/POSTGRESQL_BUILD | 2 +- 17/overlay/tmp/POSTGRESQL_MINOR | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/15/overlay/tmp/POSTGRESQL_BUILD b/15/overlay/tmp/POSTGRESQL_BUILD index 3b82ca5..2591e67 100644 --- a/15/overlay/tmp/POSTGRESQL_BUILD +++ b/15/overlay/tmp/POSTGRESQL_BUILD @@ -1 +1 @@ -15.14-r0 \ No newline at end of file +15.15-r0 \ No newline at end of file diff --git a/15/overlay/tmp/POSTGRESQL_MINOR b/15/overlay/tmp/POSTGRESQL_MINOR index 9dce2b8..ec07fd5 100644 --- a/15/overlay/tmp/POSTGRESQL_MINOR +++ b/15/overlay/tmp/POSTGRESQL_MINOR @@ -1 +1 @@ -15.14 \ No newline at end of file +15.15 \ No newline at end of file diff --git a/16/overlay/tmp/POSTGRESQL_BUILD b/16/overlay/tmp/POSTGRESQL_BUILD index dea695a..cbe3c6d 100644 --- a/16/overlay/tmp/POSTGRESQL_BUILD +++ b/16/overlay/tmp/POSTGRESQL_BUILD @@ -1 +1 @@ -16.10-r0 \ No newline at end of file +16.11-r0 \ No newline at end of file diff --git a/16/overlay/tmp/POSTGRESQL_MINOR b/16/overlay/tmp/POSTGRESQL_MINOR index 0f355d8..9a5911e 100644 --- a/16/overlay/tmp/POSTGRESQL_MINOR +++ b/16/overlay/tmp/POSTGRESQL_MINOR @@ -1 +1 @@ -16.10 \ No newline at end of file +16.11 \ No newline at end of file diff --git a/17/overlay/tmp/POSTGRESQL_BUILD b/17/overlay/tmp/POSTGRESQL_BUILD index 86d6098..63348f9 100644 --- a/17/overlay/tmp/POSTGRESQL_BUILD +++ b/17/overlay/tmp/POSTGRESQL_BUILD @@ -1 +1 @@ -17.6-r0 \ No newline at end of file +17.7-r0 \ No newline at end of file diff --git a/17/overlay/tmp/POSTGRESQL_MINOR b/17/overlay/tmp/POSTGRESQL_MINOR index 9a03da8..0511279 100644 --- a/17/overlay/tmp/POSTGRESQL_MINOR +++ b/17/overlay/tmp/POSTGRESQL_MINOR @@ -1 +1 @@ -17.6 \ No newline at end of file +17.7 \ No newline at end of file