fix: detect docker compose file when turn things off

tryzealot · Aug 27, 2024 · 08557bc · 08557bc
1 parent f2c75ee
commit 08557bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/scripts/configure-cert.sh b/scripts/configure-cert.sh
@@ -93,7 +93,6 @@ check_or_generate_selfsigned_ssl () {
 ##
 choose_deploy () {
   set +u
-  echo "ZEALOT_FORCE_SSL=${ZEALOT_FORCE_SSL}"
   if [ -n $ZEALOT_FORCE_SSL ]; then
     case "$ZEALOT_FORCE_SSL" in
       "letsencrypt" )
@@ -104,13 +103,10 @@ choose_deploy () {
         SSL_NAME=false
         ;;
       * )
-        echo "Invalid ZEALOT_FORCE_SSL value, Quitting"
-        exit
+        echo "ZEALOT_FORCE_SSL is not set, setup it."
         ;;
     esac
     echo "${_endgroup}"
-    set -u
-    return
   fi
   set -u
 

diff --git a/scripts/turn-things-off.sh b/scripts/turn-things-off.sh
@@ -1,10 +1,12 @@
 echo "${_group}Turning things off ..."
 
-if [[ -n "$MINIMIZE_DOWNTIME" ]]; then
-  # Stop everything but proxy service
-  $dc rm -fsv $($dc config --services | grep -v -E '^(web)$')
-else
-  $dc down -t $STOP_TIMEOUT --rmi local --remove-orphans
+if [[ -f "$DOCKER_COMPOSE_FILE" ]]; then
+  if [[ -n "$MINIMIZE_DOWNTIME" ]]; then
+    # Stop everything but proxy service
+    $dc rm -fsv $($dc config --services | grep -v -E '^(web)$')
+  else
+    $dc down -t $STOP_TIMEOUT --rmi local --remove-orphans
+  fi
 fi
 
 echo "${_endgroup}"