From 18fbe2378f2ac405257adb5a22b2eb3ecbd5f884 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 18 Oct 2024 09:14:55 +0100 Subject: [PATCH 1/5] Bumping version to 3.2.15 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e44ffb2..02686bc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.14 \ No newline at end of file +3.2.15 \ No newline at end of file From d97d8bcf22d2c62ceb43b44c65d68fddb20c4fb9 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 18 Oct 2024 09:15:01 +0100 Subject: [PATCH 2/5] Removing del force --- overlay/etc/nu/scripts/bf-postgresql/dump.nu | 2 +- overlay/etc/nu/scripts/bf-postgresql/restore.nu | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/overlay/etc/nu/scripts/bf-postgresql/dump.nu b/overlay/etc/nu/scripts/bf-postgresql/dump.nu index 3cf6317..fe5ae15 100644 --- a/overlay/etc/nu/scripts/bf-postgresql/dump.nu +++ b/overlay/etc/nu/scripts/bf-postgresql/dump.nu @@ -40,7 +40,7 @@ export def main [] { # delete temporary directory bf write debug $" .. deleting ($temp_dir)" dump - bf del force $temp_dir + rm --force --recursive $temp_dir # cleanup old backup files bf write debug " .. removing expired backup files" dump diff --git a/overlay/etc/nu/scripts/bf-postgresql/restore.nu b/overlay/etc/nu/scripts/bf-postgresql/restore.nu index c49a7af..1a130d6 100644 --- a/overlay/etc/nu/scripts/bf-postgresql/restore.nu +++ b/overlay/etc/nu/scripts/bf-postgresql/restore.nu @@ -28,7 +28,7 @@ export def main [] { # delete data files let data = bf env PG_DATA bf write debug " .. deleting data files" restore - bf del force $"($data)/*" + $"($data)/*" | into glob | rm --force --recursive $in # restart the PostgreSQL service bf write debug " .. reinitialising cluster" restore @@ -46,7 +46,7 @@ export def main [] { # unset restoring variable and delete dump file bf env unset $restoring - bf del force $dump_file.path + rm --force $dump_file.path # if we get here there have been no errors bf write ok "Done." restore From 7e7e576a844e3b74f55765b048bad2e0dced87df Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 18 Oct 2024 09:15:46 +0100 Subject: [PATCH 3/5] Using latest base images --- 12/Dockerfile | 2 +- 13/Dockerfile | 2 +- 14/Dockerfile | 2 +- 15/Dockerfile | 2 +- 16/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12/Dockerfile b/12/Dockerfile index 14c74f3..f6dd89f 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.9 +FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.12 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/13/Dockerfile b/13/Dockerfile index c42ab8d..f4cb5e7 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.9 +FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.12 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/14/Dockerfile b/14/Dockerfile index d79f5e0..84443d7 100644 --- a/14/Dockerfile +++ b/14/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.9 +FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.12 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/15/Dockerfile b/15/Dockerfile index 871a6cc..37f902b 100644 --- a/15/Dockerfile +++ b/15/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.9 +FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.12 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/16/Dockerfile b/16/Dockerfile index 8ff2ae8..0cd162f 100644 --- a/16/Dockerfile +++ b/16/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.9 +FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.12 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 84a2650..fba771f 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="5.4.9" +BASE_VERSION="5.4.12" echo "Base: ${BASE_VERSION}" POSTGRESQL_VERSIONS="12 13 14 15 16" From 261a0e5fe0b4c6800a4f047fd8e07604a43efb80 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 18 Oct 2024 09:23:57 +0100 Subject: [PATCH 4/5] Updating to PostgreSQL 12.20 and 13.16 --- 12/overlay/tmp/POSTGRESQL_BUILD | 2 +- 12/overlay/tmp/POSTGRESQL_MINOR | 2 +- 13/overlay/tmp/POSTGRESQL_BUILD | 2 +- 13/overlay/tmp/POSTGRESQL_MINOR | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/12/overlay/tmp/POSTGRESQL_BUILD b/12/overlay/tmp/POSTGRESQL_BUILD index dc21a8f..d046b67 100644 --- a/12/overlay/tmp/POSTGRESQL_BUILD +++ b/12/overlay/tmp/POSTGRESQL_BUILD @@ -1 +1 @@ -12.19-r0 \ No newline at end of file +12.20-r0 \ No newline at end of file diff --git a/12/overlay/tmp/POSTGRESQL_MINOR b/12/overlay/tmp/POSTGRESQL_MINOR index a3c476c..2303be6 100644 --- a/12/overlay/tmp/POSTGRESQL_MINOR +++ b/12/overlay/tmp/POSTGRESQL_MINOR @@ -1 +1 @@ -12.19 \ No newline at end of file +12.20 \ No newline at end of file diff --git a/13/overlay/tmp/POSTGRESQL_BUILD b/13/overlay/tmp/POSTGRESQL_BUILD index 8e8ddf0..668cab3 100644 --- a/13/overlay/tmp/POSTGRESQL_BUILD +++ b/13/overlay/tmp/POSTGRESQL_BUILD @@ -1 +1 @@ -13.15-r0 \ No newline at end of file +13.16-r0 \ No newline at end of file diff --git a/13/overlay/tmp/POSTGRESQL_MINOR b/13/overlay/tmp/POSTGRESQL_MINOR index 32f0f02..8f728fc 100644 --- a/13/overlay/tmp/POSTGRESQL_MINOR +++ b/13/overlay/tmp/POSTGRESQL_MINOR @@ -1 +1 @@ -13.15 \ No newline at end of file +13.16 \ No newline at end of file From 44d8ec9801e5ca95746e63d8cae75f8fa824da3f Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 18 Oct 2024 09:31:18 +0100 Subject: [PATCH 5/5] Updating to PostgreSQL 14.13, 15.8 and 16.4 --- 14/ALPINE_EDITION | 1 + 14/Dockerfile | 2 +- 14/overlay/tmp/POSTGRESQL_BUILD | 2 +- 14/overlay/tmp/POSTGRESQL_MINOR | 2 +- 15/ALPINE_EDITION | 1 + 15/Dockerfile | 2 +- 15/overlay/tmp/POSTGRESQL_BUILD | 2 +- 15/overlay/tmp/POSTGRESQL_MINOR | 2 +- 16/ALPINE_EDITION | 1 + 16/Dockerfile | 2 +- 16/overlay/tmp/POSTGRESQL_BUILD | 2 +- 16/overlay/tmp/POSTGRESQL_MINOR | 2 +- 12 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 14/ALPINE_EDITION create mode 100644 15/ALPINE_EDITION create mode 100644 16/ALPINE_EDITION diff --git a/14/ALPINE_EDITION b/14/ALPINE_EDITION new file mode 100644 index 0000000..318956c --- /dev/null +++ b/14/ALPINE_EDITION @@ -0,0 +1 @@ +3.19 \ No newline at end of file diff --git a/14/Dockerfile b/14/Dockerfile index 84443d7..d54fad3 100644 --- a/14/Dockerfile +++ b/14/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.12 +FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.12 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/14/overlay/tmp/POSTGRESQL_BUILD b/14/overlay/tmp/POSTGRESQL_BUILD index 8777914..58ef000 100644 --- a/14/overlay/tmp/POSTGRESQL_BUILD +++ b/14/overlay/tmp/POSTGRESQL_BUILD @@ -1 +1 @@ -14.12-r0 \ No newline at end of file +14.13-r0 \ No newline at end of file diff --git a/14/overlay/tmp/POSTGRESQL_MINOR b/14/overlay/tmp/POSTGRESQL_MINOR index 789b542..aefcd64 100644 --- a/14/overlay/tmp/POSTGRESQL_MINOR +++ b/14/overlay/tmp/POSTGRESQL_MINOR @@ -1 +1 @@ -14.12 \ No newline at end of file +14.13 \ No newline at end of file diff --git a/15/ALPINE_EDITION b/15/ALPINE_EDITION new file mode 100644 index 0000000..318956c --- /dev/null +++ b/15/ALPINE_EDITION @@ -0,0 +1 @@ +3.19 \ No newline at end of file diff --git a/15/Dockerfile b/15/Dockerfile index 37f902b..ee269af 100644 --- a/15/Dockerfile +++ b/15/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.12 +FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.12 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/15/overlay/tmp/POSTGRESQL_BUILD b/15/overlay/tmp/POSTGRESQL_BUILD index 0921014..e65cbaf 100644 --- a/15/overlay/tmp/POSTGRESQL_BUILD +++ b/15/overlay/tmp/POSTGRESQL_BUILD @@ -1 +1 @@ -15.7-r0 \ No newline at end of file +15.8-r0 \ No newline at end of file diff --git a/15/overlay/tmp/POSTGRESQL_MINOR b/15/overlay/tmp/POSTGRESQL_MINOR index 6932a47..e754ab7 100644 --- a/15/overlay/tmp/POSTGRESQL_MINOR +++ b/15/overlay/tmp/POSTGRESQL_MINOR @@ -1 +1 @@ -15.7 \ No newline at end of file +15.8 \ No newline at end of file diff --git a/16/ALPINE_EDITION b/16/ALPINE_EDITION new file mode 100644 index 0000000..318956c --- /dev/null +++ b/16/ALPINE_EDITION @@ -0,0 +1 @@ +3.19 \ No newline at end of file diff --git a/16/Dockerfile b/16/Dockerfile index 0cd162f..3331777 100644 --- a/16/Dockerfile +++ b/16/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.12 +FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.4.12 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-postgresql" diff --git a/16/overlay/tmp/POSTGRESQL_BUILD b/16/overlay/tmp/POSTGRESQL_BUILD index 912476a..1b0e7d4 100644 --- a/16/overlay/tmp/POSTGRESQL_BUILD +++ b/16/overlay/tmp/POSTGRESQL_BUILD @@ -1 +1 @@ -16.3-r0 \ No newline at end of file +16.4-r0 \ No newline at end of file diff --git a/16/overlay/tmp/POSTGRESQL_MINOR b/16/overlay/tmp/POSTGRESQL_MINOR index 44928df..00a5207 100644 --- a/16/overlay/tmp/POSTGRESQL_MINOR +++ b/16/overlay/tmp/POSTGRESQL_MINOR @@ -1 +1 @@ -16.3 \ No newline at end of file +16.4 \ No newline at end of file