diff --git a/linupx-scripts.sh b/linupx-scripts.sh index 81aeee2..a9bb2bb 100755 --- a/linupx-scripts.sh +++ b/linupx-scripts.sh @@ -649,41 +649,33 @@ DOCKER_CLEANUP(){ } INSTALL_WATCHTOWER() { echo - echo -en "${idsCL[LightCyan]}Are you sure you wish to install Watchtower (Y/n)? ${idsCL[Default]}" - read -n 1 choice - case "$choice" in - [Nn]) t=t;; - * ) - echo - if [ "$(docker ps -q -f name=watchtower)" ]; then - echo -en "${idsCL[LightYellow]}Removing previous Watchtower container... ${idsCL[Default]}" - docker stop watchtower >/dev/null 2>&1 - docker rm watchtower >/dev/null 2>&1 - echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" - fi - echo -e "${idsCL[LightCyan]}Installing Watchtower Docker... ${idsCL[Default]}" - docker run --detach \ - --name watchtower \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -e TZ=America/Chicago \ - -e WATCHTOWER_CLEANUP=true \ - -e WATCHTOWER_INCLUDE_STOPPED=true \ - -e WATCHTOWER_SCHEDULE="0 0 4 * * *" \ - -e WATCHTOWER_ROLLING_RESTART=true \ - -e WATCHTOWER_NO_STARTUP_MESSAGE=true \ - -e WATCHTOWER_NOTIFICATIONS=email \ - -e WATCHTOWER_NOTIFICATIONS_LEVEL=warn \ - -e WATCHTOWER_NOTIFICATION_EMAIL_FROM=watchtower-$(hostname)@scity.us \ - -e WATCHTOWER_NOTIFICATION_EMAIL_TO=b3upzaom7a@pomail.net \ - -e WATCHTOWER_NOTIFICATION_EMAIL_SERVER=mail.scity.us \ - -e WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=25 \ - containrrr/watchtower - echo -e "\n${idsCL[Green]}Watchtower has been installed${idsCL[Default]}\n" - until [ "$(docker inspect -f {{.State.Health.Status}} watchtower)"=="healthy" ]; do sleep 0.1; done; sleep 1s - docker logs watchtower - echo - ;; - esac + if [ "$(docker ps -q -f name=watchtower)" ]; then + echo -en "${idsCL[LightYellow]}Removing previous Watchtower container... ${idsCL[Default]}" + docker stop watchtower >/dev/null 2>&1 + docker rm watchtower >/dev/null 2>&1 + echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" + fi + echo -e "${idsCL[LightCyan]}Installing Watchtower Docker... ${idsCL[Default]}" + docker run --detach \ + --name watchtower \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -e TZ=America/Chicago \ + -e WATCHTOWER_CLEANUP=true \ + -e WATCHTOWER_INCLUDE_STOPPED=true \ + -e WATCHTOWER_SCHEDULE="0 0 4 * * *" \ + -e WATCHTOWER_ROLLING_RESTART=true \ + -e WATCHTOWER_NO_STARTUP_MESSAGE=true \ + -e WATCHTOWER_NOTIFICATIONS=email \ + -e WATCHTOWER_NOTIFICATIONS_LEVEL=warn \ + -e WATCHTOWER_NOTIFICATION_EMAIL_FROM=watchtower-$(hostname)@scity.us \ + -e WATCHTOWER_NOTIFICATION_EMAIL_TO=b3upzaom7a@pomail.net \ + -e WATCHTOWER_NOTIFICATION_EMAIL_SERVER=mail.scity.us \ + -e WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=25 \ + containrrr/watchtower + echo -e "\n${idsCL[Green]}Watchtower has been installed${idsCL[Default]}\n" + until [ "$(docker inspect -f {{.State.Health.Status}} watchtower)"=="healthy" ]; do sleep 0.1; done; sleep 1s + docker logs watchtower + echo } TAILSCALE_INSTALL() { echo @@ -1091,7 +1083,19 @@ MISC_MENU() { ENTER2CONTINUE MISC_MENU;; 4) DOCKER_CLEANUP; MISC_MENU;; - 5) INSTALL_WATCHTOWER; ENTER2CONTINUE; MISC_MENU;; + 5) + echo + echo -en "${idsCL[LightCyan]}Are you sure you wish to install Watchtower (Y/n)? ${idsCL[Default]}" + read -n 1 choice + case "$choice" in + [Nn]) t=t;; + * ) + INSTALL_WATCHTOWER + ENTER2CONTINUE + ;; + esac + MISC_MENU + ;; 6) RUN_STORAGE_TESTS; MISC_MENU;; [Uu]) COPYCERTS_UPDATE menu; MISC_MENU;; [Dd]) DNSUPDATE; MISC_MENU;;