From f461286780fdfddd7ef0521af073f63865eac4c7 Mon Sep 17 00:00:00 2001 From: Idriss Neumann Date: Wed, 11 Sep 2024 15:46:09 +0100 Subject: [PATCH] Use docker compose instead of docker-compose --- .gitlab-ci.yml | 2 +- ci/docker-deliver.sh | 2 +- ci/test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d1157c..c1d3ba6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ api_x86: - .gitlab-ci.yml - imalive.yml - api/* - - ci/docker-deliver.sh + - ci/* - docker-compose-build-x86.yml - Dockerfile - VERSION diff --git a/ci/docker-deliver.sh b/ci/docker-deliver.sh index 88a41db..4c273e5 100755 --- a/ci/docker-deliver.sh +++ b/ci/docker-deliver.sh @@ -24,7 +24,7 @@ docker_compose_file="docker-compose.yml" echo "${DOCKER_ACCESS_TOKEN}" | docker login --username "${DOCKER_USERNAME}" --password-stdin -COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose -f "${docker_compose_file}" build "${IMAGE}" +COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose -f "${docker_compose_file}" build "${IMAGE}" [[ $ARCH == "x86" ]] && tag_and_push "latest" "${IMAGE}" [[ $ARCH == "x86" ]] && tag_and_push "${VERSION}" "${IMAGE}" diff --git a/ci/test.sh b/ci/test.sh index 064ab77..7d0a424 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -1,4 +1,4 @@ #!/bin/bash cp .env.example .env -docker-compose -f docker-compose-local.yml up --build --abort-on-container-exit imalive-tests +docker compose -f docker-compose-local.yml up --build --abort-on-container-exit imalive-tests