Switch "docker-compose" -> "docker compose"

kitspace · Sep 22, 2024 · 5469afe · 5469afe
1 parent 25c742b
commit 5469afe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -236,7 +236,7 @@ jobs:
           ssh-keyscan '${{ github.ref_name }}.staging.kitspace.dev' >> ~/.ssh/known_hosts
           docker context create staging --docker 'host=ssh://deploy@${{ github.ref_name }}.staging.kitspace.dev'
           docker context use staging
-          docker-compose -f docker-compose.yml -f docker-compose.deploy.yml --host='ssh://deploy@${{ github.ref_name }}.staging.kitspace.dev' up -d
+          docker compose -f docker-compose.yml -f docker-compose.deploy.yml --host='ssh://deploy@${{ github.ref_name }}.staging.kitspace.dev' up -d
 
       - name: Report "review" deploy failure
         if: ${{ failure() && github.ref == 'refs/heads/review' }}
@@ -328,10 +328,10 @@ jobs:
           scripts/generate_e2e_fixtures.sh
 
           # start gitea so we can generate the admin token required for e2e
-          docker-compose -f docker-compose.yml -f docker-compose.deploy.yml up -d
+          docker compose -f docker-compose.yml -f docker-compose.deploy.yml up -d
           until docker logs kitspace_gitea_1 | grep -q 'ORM engine initialization successful' ; do sleep 3s; done
           token="$(deno run --allow-env --allow-net --allow-run ./scripts/importBoardsTxt.ts --tokenOnly)"
-          docker-compose stop
+          docker compose stop
 
           echo "CYPRESS_GITEA_ADMIN_TOKEN=${token}" >> $GITHUB_ENV
 
@@ -354,7 +354,7 @@ jobs:
           COMMIT_INFO_TIMESTAMP: '${{ github.event.head_commit.timestamp }}'
           COMMIT_INFO_BRANCH: '${{ github.ref_name || github.head_ref }}'
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose.deploy.yml -f docker-compose.e2e.yml up \
+          docker compose -f docker-compose.yml -f docker-compose.deploy.yml -f docker-compose.e2e.yml up \
             --abort-on-container-exit --exit-code-from e2e
 
   tag_docker_images:

diff --git a/.github/workflows/test-processor.yml b/.github/workflows/test-processor.yml
@@ -6,6 +6,7 @@ on:
       - 'processor/**'
 
 jobs:
+
   test_processor:
     runs-on: ubuntu-20.04
     steps:

diff --git a/scripts/install_gitea.sh b/scripts/install_gitea.sh
@@ -2,8 +2,8 @@
 
 set -Eeuo pipefail -o verbose
 
-docker-compose -f docker-compose.yml -f docker-compose.deploy.yml up &
+docker compose -f docker-compose.yml -f docker-compose.deploy.yml up &
 
 until docker logs kitspace_gitea_1 | grep 'ORM engine initialization successful' ; do sleep 3s; done
 
-docker-compose stop
+docker compose stop