From bceba32d5dc7dc08938665a1a9f0ef07de4760de Mon Sep 17 00:00:00 2001 From: pabra Date: Sun, 4 Aug 2024 11:23:12 +0200 Subject: [PATCH] publish: use `docker compose` over `docker-compose` --- run_tests.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 811eeed..287662a 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -3,7 +3,7 @@ set -e cleanup() { - docker-compose -f test/docker-compose.yml down --volumes + docker compose -f test/docker-compose.yml down --volumes } trap cleanup EXIT INT @@ -17,17 +17,17 @@ fi run_tests() { export HTTPD_PORT="$1" export USER="$2" - docker-compose -f test/docker-compose.yml up -d - docker-compose -f test/docker-compose.yml run --rm ${no_tty} awstats-test /bin/sh -c "wait4ports -t 10 tcp://awstats:$HTTPD_PORT" - docker-compose -f test/docker-compose.yml run --rm ${no_tty} awstats-test test1.sh "$HTTPD_PORT" - docker-compose -f test/docker-compose.yml exec ${no_tty} awstats awstats_updateall.pl now - docker-compose -f test/docker-compose.yml run --rm ${no_tty} awstats-test test2.sh "$HTTPD_PORT" - docker-compose -f test/docker-compose.yml exec ${no_tty} awstats awstats_updateall.pl now - docker-compose -f test/docker-compose.yml run --rm ${no_tty} awstats-test test3.sh "$HTTPD_PORT" + docker compose -f test/docker-compose.yml up -d + docker compose -f test/docker-compose.yml run --rm ${no_tty} awstats-test /bin/sh -c "wait4ports -t 10 tcp://awstats:$HTTPD_PORT" + docker compose -f test/docker-compose.yml run --rm ${no_tty} awstats-test test1.sh "$HTTPD_PORT" + docker compose -f test/docker-compose.yml exec ${no_tty} awstats awstats_updateall.pl now + docker compose -f test/docker-compose.yml run --rm ${no_tty} awstats-test test2.sh "$HTTPD_PORT" + docker compose -f test/docker-compose.yml exec ${no_tty} awstats awstats_updateall.pl now + docker compose -f test/docker-compose.yml run --rm ${no_tty} awstats-test test3.sh "$HTTPD_PORT" } if [ "$1" != 'skip_build' ]; then - docker-compose -f test/docker-compose.yml build + docker compose -f test/docker-compose.yml build fi run_tests 80 0