diff --git a/services/check_services_are_running.sh b/services/check_services_are_running.sh index 53e8e6daccc681261cc14d5e1b83b17f4ab52a31..3bad399d33d55e04256e6faf58cd00293ecbbc4e 100755 --- a/services/check_services_are_running.sh +++ b/services/check_services_are_running.sh @@ -1,6 +1,6 @@ #!/bin/bash -running="$(docker-compose -f docker-compose-capif.yml ps --services --all --filter "status=running")" -services="$(docker-compose -f docker-compose-capif.yml ps --services --all)" +running="$(docker compose -f docker-compose-capif.yml ps --services --all --filter "status=running")" +services="$(docker compose -f docker-compose-capif.yml ps --services --all)" if [ "$running" != "$services" ]; then echo "Following services are not running:" # Bash specific diff --git a/services/clean_capif_docker_services.sh b/services/clean_capif_docker_services.sh index 7b3c91e031803c15e0443b7e3da2c6a38d391633..fb8949784d4eb81d5a0b958c197765f82118d60d 100755 --- a/services/clean_capif_docker_services.sh +++ b/services/clean_capif_docker_services.sh @@ -62,8 +62,8 @@ echo "after check" echo "${FILES[@]}" for FILE in "${FILES[@]}"; do - echo "Executing 'docker-compose down' for file $FILE" - docker-compose -f "$FILE" down --rmi all + echo "Executing 'docker compose down' for file $FILE" + docker compose -f "$FILE" down --rmi all status=$? if [ $status -eq 0 ]; then echo "*** Removed Service from $FILE ***" diff --git a/services/run.sh b/services/run.sh index 8214516f7616da74eae34b8079cd2f3d479b87c8..83011c34414af3725c56b86640b6e50591298276 100755 --- a/services/run.sh +++ b/services/run.sh @@ -28,13 +28,13 @@ else fi # Read params -while getopts ":c:m:h" opt; do +while getopts ":c:mh" opt; do case $opt in c) HOSTNAME="$OPTARG" ;; m) - MONITORING_STATE="$OPTARG" + MONITORING_STATE=true ;; h) help