diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9800abf0ca5584d0084698915c1c8c2c901435cf..67743e6a8bc7c796d31b40c985688a26ad3f8640 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,10 +37,11 @@ test-docker-compose: when: runner_system_failure script: - apk update && apk upgrade && apk add jq bash curl + - docker compose version - ./test_docker_compose.sh after_script: - - docker-compose logs back > log/docker-compose.back.log - - docker-compose logs > log/docker-compose.log + - docker compose logs back > log/docker-compose.back.log + - docker compose logs > log/docker-compose.log artifacts: when: always paths: diff --git a/test_docker_compose.sh b/test_docker_compose.sh index 3da4176851b10a3f9f85598804c3dd82f3b7855f..376ffc083583148758339a94760a284ed7741dfe 100755 --- a/test_docker_compose.sh +++ b/test_docker_compose.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -if [ "$(docker-compose ps | grep jass | grep -v Exit | wc -l)" == "0" ]; then - docker-compose -f docker-compose.yaml -f docker-compose.test.yaml up -d --build || exit 99 +if [ "$(docker compose ps | grep jass | grep -v Exit | wc -l)" == "0" ]; then + docker compose -f docker-compose.yaml -f docker-compose.test.yaml up -d --build || exit 99 echo "Waiting some time for interface to be up" sleep 5 else