Release 2.3.2 - See CHANGELOG.md

#51 Fix backup of multiple InfluxDB databases failure

CHANGELOG.md

@@ -1,7 +1,19 @@
+## 2.3.2 2020-11-14 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Reapply S6-Overlay into filesystem as Postgresql build is removing S6 files due to edge containing S6 overlay
+
+
+## 2.3.1 2020-11-11 <bambi73@github>
+
+   ### Fixed
+      - Multiple Influx DB's not being backed up correctly
+
 ## 2.3.0 2020-10-15 <dave at tiredofit dot ca>
 
    ### Added
       - Microsoft SQL Server support (experimental)
+
    ### Changed
       - Compiled Postgresql 13 from source to backup psql/13 hosts
 

Dockerfile

@@ -148,7 +148,19 @@ RUN set -ex && \
 ### Cleanup
     apk del .db-backup-build-deps && \
     rm -rf /usr/src/* && \
-    rm -rf /tmp/* /var/cache/apk/*
+    rm -rf /tmp/* /var/cache/apk/* && \
+    \
+### Temp Hack for S6 Overlay && \
+### S6 installation
+    apkArch="$(apk --print-arch)"; \
+	case "$apkArch" in \
+		x86_64) s6Arch='amd64' ;; \
+		armhf) s6Arch='armhf' ;; \
+		aarch64) s6Arch='aarch64' ;; \
+		ppc64le) s6Arch='ppc64le' ;; \
+		*) echo >&2 "Error: unsupported architecture ($apkArch)"; exit 1 ;; \
+	esac; \
+    curl -sSL https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${s6Arch}.tar.gz | tar xfz - -C /
 
 ### S6 Setup
     ADD install  /

install/etc/services.available/10-db-backup/run

@@ -140,6 +140,7 @@ backup_influx() {
         influx_compression="-portable"
     fi
     for DB in $DB_NAME; do
+        target=influx_${DB}_${dbhost}_${now}
         influxd backup ${influx_compression} -database $DB -host ${dbhost}:${dbport} ${tmpdir}/${target}
         exit_code=$?
         generate_md5