From e98ba6dbd6519405d5e02a8e060d81c74edc62b2 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Fri, 19 Apr 2024 07:54:19 +0200 Subject: [PATCH] Change docker-compose to docker compose at scripts --- services/check_services_are_running.sh | 4 ++-- services/clean_capif_docker_services.sh | 4 ++-- services/run.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/check_services_are_running.sh b/services/check_services_are_running.sh index 53e8e6d..3bad399 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 7b3c91e..fb89497 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 8214516..83011c3 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 -- GitLab