bfren · bfren · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024
diff --git 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/12/overlay/tmp/POSTGRESQL_BUILD b/12/overlay/tmp/POSTGRESQL_BUILD
@@ -1 +1 @@
-12.19-r0
+12.20-r0
diff --git a/12/overlay/tmp/POSTGRESQL_MINOR b/12/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-12.19
+12.20
diff --git 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/13/overlay/tmp/POSTGRESQL_BUILD b/13/overlay/tmp/POSTGRESQL_BUILD
@@ -1 +1 @@
-13.15-r0
+13.16-r0
diff --git a/13/overlay/tmp/POSTGRESQL_MINOR b/13/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-13.15
+13.16
diff --git a/14/ALPINE_EDITION b/14/ALPINE_EDITION
@@ -0,0 +1 @@
+3.19
diff --git 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.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
@@ -1 +1 @@
-14.12-r0
+14.13-r0
diff --git a/14/overlay/tmp/POSTGRESQL_MINOR b/14/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-14.12
+14.13
diff --git a/15/ALPINE_EDITION b/15/ALPINE_EDITION
@@ -0,0 +1 @@
+3.19
diff --git 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.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
@@ -1 +1 @@
-15.7-r0
+15.8-r0
diff --git a/15/overlay/tmp/POSTGRESQL_MINOR b/15/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-15.7
+15.8
diff --git a/16/ALPINE_EDITION b/16/ALPINE_EDITION
@@ -0,0 +1 @@
+3.19
diff --git 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.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
@@ -1 +1 @@
-16.3-r0
+16.4-r0
diff --git a/16/overlay/tmp/POSTGRESQL_MINOR b/16/overlay/tmp/POSTGRESQL_MINOR
@@ -1 +1 @@
-16.3
+16.4
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.2.14
+3.2.15
diff --git 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"

diff --git 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
@@ -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