V1.1.1 (#3)

aSouchereau · Aug 9, 2024 · 3cedfcd · 3cedfcd
1 parent bd54127
commit 3cedfcd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ volumes:
 ### Database
 #### sqlite
 By default, this image looks for a db.sqlite3 file in the top level of your mounted data directory. Set environment variable `DB_TYPE` to `sqlite` or leave it unset. 
--#### MariaDB/MySQL
+#### MariaDB/MySQL
 For MySQL or MariaDB setups, this image requires your vaultwarden database credentials to connect and create a dump file. Set the following environment variables
 - `DB_TYPE` ("mysql")
 - `DB_HOST` (server address or name of docker container running db server)

diff --git a/scripts/backup.sh b/scripts/backup.sh
@@ -81,7 +81,7 @@ case "$DB_TYPE" in
         backup_mysql
     ;;
     *)
-      echo "[Error] Invalid database type. Skipping database backup..."
+      echo "[Warning] Invalid database type. Skipping database backup..."
     ;;
 esac
 

diff --git a/scripts/entry.sh b/scripts/entry.sh
@@ -13,7 +13,7 @@ trap 'cleanup' SIGINT SIGTERM
 echo "╦  ╦╦ ╦       ╔╗ ╔═╗╔═╗╦╔═╦ ╦╔═╗       ╔═╗╔═╗╔═╗";
 echo "╚╗╔╝║║║  ───  ╠╩╗╠═╣║  ╠╩╗║ ║╠═╝  ───  ║ ╦╠╣ ╚═╗";
 echo " ╚╝ ╚╩╝       ╚═╝╩ ╩╚═╝╩ ╩╚═╝╩         ╚═╝╚  ╚═╝";
-echo "v1.1.0";
+echo "v1.1.1";
 
 
 # populate output for dev testing
@@ -36,7 +36,11 @@ DB_TYPE="${DB_TYPE:-"sqlite"}"
 case "$DB_TYPE" in
     sqlite)
         echo "Checking sqlite database"
-        sqlite3 "${STAGING_DIR}/db.sqlite3" "pragma integrity_check;"
+        if sqlite3 "${STAGING_DIR}/db.sqlite3" "pragma integrity_check;"; then
+            echo ""
+        else
+            echo "[Warning]: database file failed initial integrity check"
+        fi
         ;;
     mysql|mariadb)
         result=$(mysql --host $DB_HOST --port $DB_PORT \

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.1.0
+1.1.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,7 @@ case "$DB_TYPE" in @@
             backup_mysql
         ;;
         *)
-          echo "[Error] Invalid database type. Skipping database backup..."
+          echo "[Warning] Invalid database type. Skipping database backup..."
         ;;
     esac
@@ Expand Down @@