From 8846bb5cdf7e159a3b355700752406bc5f203a49 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Wed, 3 Apr 2024 11:38:07 +0200
Subject: [PATCH] bump docker compose
---
.gitlab-ci.yml | 5 +++--
test_docker_compose.sh | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9800abf0..67743e6a 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 3da41768..376ffc08 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
--
GitLab