docker-compose -> docker compose

wri · Aug 26, 2024 · 548048d · 548048d
1 parent 39d60fc
commit 548048d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/terraform_destroy.yaml b/.github/workflows/terraform_destroy.yaml
@@ -8,4 +8,4 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - name: Destroy state and delete workspace
-      run: docker-compose -f docker/terraform/docker-compose.yml run --entrypoint delete_workspace --rm  terraform github.ref
+      run: docker compose -f docker/terraform/docker-compose.yml run --entrypoint delete_workspace --rm  terraform github.ref
diff --git a/scripts/infra b/scripts/infra
@@ -2,5 +2,5 @@
 
 set -e
 
-docker-compose -f terraform/docker/docker-compose.yml build
-docker-compose -f terraform/docker/docker-compose.yml run --rm terraform "$@"
+docker compose -f terraform/docker/docker-compose.yml build
+docker compose -f terraform/docker/docker-compose.yml run --rm terraform "$@"
diff --git a/scripts/test b/scripts/test
@@ -27,21 +27,21 @@ if [ "${BUILD}" = true ]; then
     # pre-download bigdata image, otherwise localstack try to download it when you make your first EMR request,
     # and cause boto3 to timeout because it's a ~2.5 GB image
     docker pull localstack/bigdata
-    docker-compose -f docker-compose-test.yml --project-name gfw-datapump_test build --no-cache datapump_test
+    docker compose -f docker-compose-test.yml --project-name gfw-datapump_test build --no-cache datapump_test
 fi
 
-#docker-compose -f docker-compose-test.yml --project-name gfw-datapump_test restart mock_server
+#docker compose -f docker-compose-test.yml --project-name gfw-datapump_test restart mock_server
 
 if [ "${DUMP_TO_STDOUT}" = true ]; then
-    docker-compose -f docker-compose-test.yml --project-name gfw-datapump_test run datapump_test || failed=yes
-    docker-compose -f docker-compose-test.yml --project-name gfw-datapump_test logs -t
+    docker compose -f docker-compose-test.yml --project-name gfw-datapump_test run datapump_test || failed=yes
+    docker compose -f docker-compose-test.yml --project-name gfw-datapump_test logs -t
 else
-    docker-compose -f docker-compose-test.yml --project-name gfw-datapump_test run datapump_test | tee tests/logs/tests.log || failed=yes
-    docker-compose -f docker-compose-test.yml --project-name gfw-datapump_test logs --no-color localstack > tests/logs/localstack.log
-    docker-compose -f docker-compose-test.yml --project-name gfw-datapump_test logs --no-color mock_server > tests/logs/mock_server.log
+    docker compose -f docker-compose-test.yml --project-name gfw-datapump_test run datapump_test | tee tests/logs/tests.log || failed=yes
+    docker compose -f docker-compose-test.yml --project-name gfw-datapump_test logs --no-color localstack > tests/logs/localstack.log
+    docker compose -f docker-compose-test.yml --project-name gfw-datapump_test logs --no-color mock_server > tests/logs/mock_server.log
 fi
 
-docker-compose -f docker-compose-test.yml --project-name gfw-datapump_test down
+docker compose -f docker-compose-test.yml --project-name gfw-datapump_test down
 
 rm tests/terraform/terraform.tfstate*
 [[ -z "${failed:-}" ]] || exit 1