Use docker compose instead of docker-compose

comworkio · Sep 11, 2024 · f461286 · f461286
1 parent 007979e
commit f461286
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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