From 2da7a743988c6ab810c3a237fd10bb4342798daa Mon Sep 17 00:00:00 2001 From: Andrew Hurley Date: Thu, 27 Oct 2022 00:16:38 +1100 Subject: [PATCH] no more profiles --- vvv.sh | 74 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/vvv.sh b/vvv.sh index f68cb30..a06997c 100755 --- a/vvv.sh +++ b/vvv.sh @@ -4,11 +4,20 @@ set -u set -o pipefail +usage () { + printf "Usage: vvv.sh \n" + printf " project = Compose project folder.\n" + printf " Option r: restore operation\n" + printf " Option d: keep containers down - don't bring back up\n" +} + RESTORE="false" +DOWN="false" OUTPUT="" -while getopts ':r' OPT; do +while getopts ':rd' OPT; do case $OPT in r) RESTORE="true"; OUTPUT="${OUTPUT} Option: RESTORE OPERATION";; + d) DOWN="true"; OUTPUT="${OUTPUT} Option: KEEP DOWN";; \?) usage; exit;; esac done @@ -19,12 +28,6 @@ if [[ $RESTORE == "true" ]] && [[ ! -f docker-restore.sh ]]; then exit 1 fi -usage () { - printf "Usage: vvv.sh [ ... ]\n" - printf " Project = Compose project folder.\n" - printf " Profile(s) = profiles to stop and then restart after.\n" -} - scripts () { for MODE in backup restore; do FILE="docker-${MODE}.sh" @@ -56,7 +59,7 @@ scripts () { done } -if [[ $# -lt 2 ]]; then +if [[ $# -lt 1 ]]; then usage exit 1 fi @@ -77,39 +80,42 @@ pushd "../${PROJECT}" > /dev/null || exit 1 if [[ ! $RESTORE == "true" ]]; then scripts fi -shift -for PRO in $@; do - COMMAND="sudo docker compose --profile=${PRO} stop" - printf "${COMMAND}\n" - ${COMMAND} - if ! ${COMMAND}; then - printf "Services 'docker compose stop' error." - exit 1 - fi - COMMAND="sudo docker compose --profile=${PRO} rm -f" - printf "${COMMAND}\n" - ${COMMAND} - if ! ${COMMAND}; then - printf "Services 'docker compose rm' error." - exit 1 - fi -done +COMMAND="sudo docker compose stop" +printf "${COMMAND}\n" +${COMMAND} +if ! ${COMMAND}; then + printf "Services 'docker compose stop' error." + exit 1 +fi +COMMAND="sudo docker compose rm -f" +printf "${COMMAND}\n" +${COMMAND} +if ! ${COMMAND}; then + printf "Services 'docker compose rm' error." + exit 1 +fi if [[ $RESTORE == "true" ]]; then "./docker-restore.sh" else "./docker-backup.sh" -fi - -for PRO in $@; do - COMMAND="sudo docker compose --profile=${PRO} up -d" - printf "${COMMAND}\n" - if ! ${COMMAND}; then - printf "Services 'up' error." - exit 1 + if [[ $DOWN = "false" ]]; then + COMMAND="sudo docker compose up -d" + printf "${COMMAND}\n" + if ! ${COMMAND}; then + printf "Services 'up' error." + exit 1 + fi fi -done +fi + +COMMAND="sudo docker compose up -d" +printf "${COMMAND}\n" +if ! ${COMMAND}; then + printf "Services 'up' error." + exit 1 +fi popd > /dev/null || exit 1