From 22e126200ee266362c9f8885cd4fce62fd57c527 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Tue, 15 Nov 2022 13:07:21 -0800
Subject: [PATCH] Release 3.5.6 - See CHANGELOG.md

---
 .github/workflows/main.yml            | 1 -
 .github/workflows/manual.yml          | 1 -
 CHANGELOG.md                          | 6 ++++++
 Dockerfile                            | 2 +-
 install/assets/functions/10-db-backup | 7 +++++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cfd2a8a..572e515 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,6 @@ jobs:
         id: prep
         run: |
           DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
-          set -x
           if [[ $GITHUB_REF == refs/heads/* ]]; then
              if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
                BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index d886b77..f1b6900 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -19,7 +19,6 @@ jobs:
         id: prep
         run: |
           DOCKER_IMAGE=${GITHUB_REPOSITORY/docker-/}
-          set -x
           if [[ $GITHUB_REF == refs/heads/* ]]; then
              if [[ $GITHUB_REF == refs/heads/*/* ]] ; then
                BRANCH="${DOCKER_IMAGE}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d4c723..034b91a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.5.6 2022-11-15 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Add failure if DB_TYPE empty or malformed
+
+
 ## 3.5.5 2022-10-18 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/Dockerfile b/Dockerfile
index 610b908..4c16747 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -83,4 +83,4 @@ RUN set -ex && \
     rm -rf /root/.cache /tmp/* /var/cache/apk/*
 
 ### S6 Setup
-ADD install  /
+COPY install  /
diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup
index ee95db2..292436b 100644
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
@@ -1,6 +1,7 @@
 #!/command/with-contenv bash
 
 bootstrap_variables() {
+    sanity_var DB_TYPE "Set appropriate DB_TYPE"
     case "${DB_TYPE,,}" in
         couch* )
             dbtype=couch
@@ -74,12 +75,18 @@ bootstrap_variables() {
         sqlite* )
             dbtype=sqlite3
         ;;
+        * )
+            print_error "I don't recognize 'DB_TYPE=${DB_TYPE}' - Exitting.."
+            exit 99
+        ;;
     esac
 
     if [ "${BACKUP_LOCATION,,}" = "s3" ] || [ "${BACKUP_LOCATION,,}" = "minio" ] ; then
         file_env 'S3_KEY_ID'
         file_env 'S3_KEY_SECRET'
     fi
+
+
 }
 
 backup_couch() {