Add with_tmpdir helper, use it for barman backups

Author: immerrr

bin/with_tmpdir

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+if [ $# -lt 2 ]; then
+    echo "Usage: $0 <TMPDIR_PATTERN> <CMD> <ARGS...>" >&2
+    exit 1
+fi
+
+TMPDIR_PATTERN=$1
+shift
+export TMPDIR=$(mktemp -d "${TMPDIR_PATTERN}")
+
+if [ -z "${TMPDIR}" ]; then
+    echo "Couldn't create temp directory, exiting" >&2
+    exit 1
+fi
+
+
+echo "Created temp directory ${TMPDIR}" >&2
+
+cleanup() {
+    local rc=$?
+
+    if [ -z "${EXITCODE}" ]; then
+        kill %% >/dev/null
+    fi
+
+    if [ -e "${TMPDIR}" ]; then
+        echo "Removing temp directory ${TMPDIR} ..."
+        rm -rf -- "${TMPDIR}"
+    fi
+
+    # restore the original exit status
+    exit ${EXITCODE:-$rc}
+}
+
+trap cleanup EXIT
+
+"$@" &
+wait %%
+EXITCODE=$?

internal/flypg/barman.go

@@ -134,7 +134,7 @@ func (b *Barman) Backup(ctx context.Context, cfg BackupConfig) ([]byte, error) {
 		args = append(args, "-n", cfg.Name)
 	}
 
-	return utils.RunCmd(ctx, "postgres", "barman-cloud-backup", args...)
+	return utils.RunCmd(ctx, "postgres", "with_tmpdir", append([]string{"/data/barman.tmp.XXXXXXXX", "barman-cloud-backup"}, args...)...)
 }
 
 // RestoreBackup returns the command string used to restore a base backup.
@@ -149,7 +149,7 @@ func (b *Barman) RestoreBackup(ctx context.Context, name string) ([]byte, error)
 		defaultRestoreDir,
 	}
 
-	return utils.RunCmd(ctx, "postgres", "barman-cloud-restore", args...)
+	return utils.RunCmd(ctx, "postgres", "with_tmpdir", append([]string{"/data/barman.tmp.XXXXXXXX", "barman-cloud-restore"}, args...)...)
 }
 
 func (b *Barman) ListBackups(ctx context.Context) (BackupList, error) {

pg17/Dockerfile

@@ -26,7 +26,7 @@ ARG PG_MAJOR_VERSION
 ARG PG_VERSION
 ARG POSTGIS_MAJOR=3
 ARG HAPROXY_VERSION=2.8
-ARG REPMGR_VERSION=5.5.0+debpgdg-1.pgdg24.04+1
+ARG REPMGR_VERSION=5.5.0+debpgdg-3.pgdg24.04+1
 
 ENV PGDATA=/data/postgresql
 ENV PGPASSFILE=/data/.pgpass