From a3c3d3717edb3026ed24526d7d1d04fb847e4206 Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 12 Oct 2026 09:33:56 +0100 Subject: [PATCH 1/5] Bumping version to 4.2.15 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2393fef..9dd64db 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.14 \ No newline at end of file +4.2.15 \ No newline at end of file From 9513dce0e7aaaf3446d8782ca712d116dae4c676 Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 12 Oct 2026 09:34:03 +0100 Subject: [PATCH 2/5] Using new mod.nu format --- overlay/etc/nu/scripts/bf-postgresql/mod.nu | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/overlay/etc/nu/scripts/bf-postgresql/mod.nu b/overlay/etc/nu/scripts/bf-postgresql/mod.nu index 0bf0cec..a995d7a 100644 --- a/overlay/etc/nu/scripts/bf-postgresql/mod.nu +++ b/overlay/etc/nu/scripts/bf-postgresql/mod.nu @@ -1,8 +1,7 @@ -export module conf.nu -export module ctl.nu -export module db.nu -export module dump.nu -export module export.nu -export module import.nu -export module restore.nu -export module run.nu +export use conf.nu +export use ctl.nu +export use db.nu +export use dump.nu +export use export-db.nu +export use import.nu +export use restore.nu From 20c39f167790852b63a414583d20fb21ada4db2f Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 12 Oct 2026 09:34:31 +0100 Subject: [PATCH 3/5] Using Nushell in S6 service run file --- overlay/etc/nu/scripts/bf-postgresql/run.nu | 22 ---------- overlay/etc/s6-overlay/s6-rc.d/postgresql/run | 40 +++++++++++++------ 2 files changed, 27 insertions(+), 35 deletions(-) delete mode 100644 overlay/etc/nu/scripts/bf-postgresql/run.nu diff --git a/overlay/etc/nu/scripts/bf-postgresql/run.nu b/overlay/etc/nu/scripts/bf-postgresql/run.nu deleted file mode 100644 index 95b2f17..0000000 --- a/overlay/etc/nu/scripts/bf-postgresql/run.nu +++ /dev/null @@ -1,22 +0,0 @@ -use bf -use restore.nu - -# Run preflight checks before executing process -export def preflight [] { - # load environment - bf env load - - # manually set executing script - bf env x_set --override run postgresql - - # exit if we are restoring - if (restore is_restoring) { - let for = 5sec - bf write $"A backup is being restored so sleep for ($for)." - sleep $for - exit 0 - } - - # if we get here we are ready to start PostgreSQL - bf write "Starting PostgreSQL." -} diff --git a/overlay/etc/s6-overlay/s6-rc.d/postgresql/run b/overlay/etc/s6-overlay/s6-rc.d/postgresql/run index 78444e6..10eb489 100644 --- a/overlay/etc/s6-overlay/s6-rc.d/postgresql/run +++ b/overlay/etc/s6-overlay/s6-rc.d/postgresql/run @@ -1,18 +1,32 @@ -#!/bin/withenv sh +#!/usr/bin/nu -set -euo pipefail +use bf +use bf-postgresql ["restore is_restoring"] +use bf-s6 +bf env load +# Start PostgreSQL as the postgres user +def main [ + name: string # The service name, passed by s6-supervise +] { + # set executable name - used to make log output more useful + bf env x_set --override run $name -#====================================================================================================================== -# Run preflight checks -#====================================================================================================================== + # run checks before executing service + if (restore is_restoring) { + let for = 5sec + bf write $"A backup is being restored so sleep for ($for)." + sleep $for -nu -c "use bf-postgresql run ; run preflight" + # exit cleanly - S6 will automatically restart the service + exit 0 + } - -#====================================================================================================================== -# Run as PostgreSQL user -# -D path to the data directory -#====================================================================================================================== - -exec pg postgres -D "${BF_PG_DATA}" + # flags: + # -D path to the data directory + bf write "Starting PostgreSQL." + let args = [ + "-D" (bf env PG_DATA) + ] + bf-s6 svc launch s6-setuidgid postgres postgres ...$args +} From 40a8e261b3f12aad817e504e22eb69b19d0f5c91 Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 12 Oct 2026 09:34:49 +0100 Subject: [PATCH 4/5] Using export-db to avoid reserved word clash --- .../etc/nu/scripts/bf-postgresql/{export.nu => export-db.nu} | 0 overlay/usr/bin/bf/pg-export | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename overlay/etc/nu/scripts/bf-postgresql/{export.nu => export-db.nu} (100%) diff --git a/overlay/etc/nu/scripts/bf-postgresql/export.nu b/overlay/etc/nu/scripts/bf-postgresql/export-db.nu similarity index 100% rename from overlay/etc/nu/scripts/bf-postgresql/export.nu rename to overlay/etc/nu/scripts/bf-postgresql/export-db.nu diff --git a/overlay/usr/bin/bf/pg-export b/overlay/usr/bin/bf/pg-export index c8a23d1..19db759 100644 --- a/overlay/usr/bin/bf/pg-export +++ b/overlay/usr/bin/bf/pg-export @@ -8,5 +8,5 @@ bf env load -x def main [ name: string # The name of the database to export ] { - $name | bf-postgresql export + $name | bf-postgresql export-db } From 7fea746fcaca577a592e504c365246db2190a2dd Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 12 Oct 2026 09:51:44 +0100 Subject: [PATCH 5/5] Using latest base images --- 12/Dockerfile | 2 +- 13/Dockerfile | 2 +- 14/Dockerfile | 2 +- 15/Dockerfile | 2 +- 16/Dockerfile | 2 +- 17/Dockerfile | 2 +- 18/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/12/Dockerfile b/12/Dockerfile index abf53f0..5f452aa 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/13/Dockerfile b/13/Dockerfile index 918a451..98e82d8 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/14/Dockerfile b/14/Dockerfile index e20da37..90e03e3 100644 --- a/14/Dockerfile +++ b/14/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/15/Dockerfile b/15/Dockerfile index a55af29..76e222a 100644 --- a/15/Dockerfile +++ b/15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/16/Dockerfile b/16/Dockerfile index efe752a..34153a0 100644 --- a/16/Dockerfile +++ b/16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/17/Dockerfile b/17/Dockerfile index e65aace..7e52512 100644 --- a/17/Dockerfile +++ b/17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/18/Dockerfile b/18/Dockerfile index a4a146f..df4c8f6 100644 --- a/18/Dockerfile +++ b/18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index b519aba..04e834a 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.4.0" +BASE_VERSION="6.5.0" echo "Base: ${BASE_VERSION}" POSTGRESQL_VERSIONS="12 13 14 15 16 17 18"