use docker compose instead docker-compose

dtuchs · Jun 21, 2024 · 6c67f1d · 6c67f1d
1 parent 96e2b4d
commit 6c67f1d
Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -38,8 +38,8 @@ jobs:
         run: |
           pwd
           gradle :rococo-auth:jib -x :rococo-e2e:test
-          docker-compose pull auth.rococo.dc
-          docker-compose stop auth.rococo.dc && docker-compose up -d --no-deps auth.rococo.dc
+          docker compose pull auth.rococo.dc
+          docker compose stop auth.rococo.dc && docker compose up -d --no-deps auth.rococo.dc
           docker system prune -a -f
           echo "Deploy auth to stage done!"
 
@@ -49,8 +49,8 @@ jobs:
         run: |
           pwd
           gradle :rococo-api:jib -x :rococo-e2e:test
-          docker-compose pull api.rococo.dc
-          docker-compose stop api.rococo.dc && docker-compose up -d --no-deps api.rococo.dc
+          docker compose pull api.rococo.dc
+          docker compose stop api.rococo.dc && docker compose up -d --no-deps api.rococo.dc
           docker system prune -a -f
           echo "Deploy api to stage done!"
 
@@ -63,7 +63,7 @@ jobs:
           docker push ${{ vars.DOCKER_HUB_ACC }}/rococo-client-${{ env.PROFILE }}:0.0.1-SNAPSHOT
           docker push ${{ vars.DOCKER_HUB_ACC }}/rococo-client-${{ env.PROFILE }}:latest
           cd ../ || exit 1
-          docker-compose pull client.rococo.dc
-          docker-compose stop client.rococo.dc && docker-compose up -d --no-deps client.rococo.dc
+          docker compose pull client.rococo.dc
+          docker compose stop client.rococo.dc && docker compose up -d --no-deps client.rococo.dc
           docker system prune -a -f
           echo "Deploy frontend to stage done!"
diff --git a/docker-compose-dev.sh b/docker-compose-dev.sh
@@ -2,7 +2,7 @@
 source ./docker.properties
 export PROFILE="${PROFILE:=docker}"
 
-PREFIX="${IMAGE_PREFIX}" PROFILE="${PROFILE}" docker-compose down
+PREFIX="${IMAGE_PREFIX}" PROFILE="${PROFILE}" docker compose down
 
 docker_containers="$(docker ps -a -q)"
 docker_images="$(docker images --format '{{.Repository}}:{{.Tag}}' | grep 'rococo')"
@@ -25,5 +25,5 @@ docker build -t ${IMAGE_PREFIX}/rococo-client-${PROFILE}:${FRONT_VERSION} -t ${I
 
 cd ../
 docker images
-PREFIX="${IMAGE_PREFIX}" PROFILE="${PROFILE}" docker-compose up -d
+PREFIX="${IMAGE_PREFIX}" PROFILE="${PROFILE}" docker compose up -d
 docker ps -a