fix(cicd): use docker compose v2 to unblock github actions builds

ehmpathy · Aug 3, 2024 · 9ab2665 · 9ab2665
1 parent 66c159c
commit 9ab2665
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/...tices/package-json-order/best-practice/__snapshots__/package.json.declapract.test.ts.snap b/...tices/package-json-order/best-practice/__snapshots__/package.json.declapract.test.ts.snap
@@ -40,9 +40,9 @@ exports[`package.json order should sort a full example of a package json correct
     "build:compile": "tsc -p ./tsconfig.build.json",
     "build": "npm run build:clean && npm run build:compile",
     "provision:docker:prepare": "cp provision/schema/sql/init/.extensions.sql provision/docker/integration_test_db/init/ && cp provision/schema/sql/init/.schema.sql provision/docker/integration_test_db/init/ && cp provision/schema/sql/init/.user.cicd.sql provision/docker/integration_test_db/init/",
-    "provision:docker:up": "docker-compose -f ./provision/docker/integration_test_db/docker-compose.yml up -d --force-recreate --build --renew-anon-volumes",
-    "provision:docker:await": "docker-compose -f ./provision/docker/integration_test_db/docker-compose.yml exec -T postgres /root/wait-for-postgres.sh",
-    "provision:docker:down": "docker-compose -f ./provision/docker/integration_test_db/docker-compose.yml down",
+    "provision:docker:up": "docker compose -f ./provision/docker/integration_test_db/docker-compose.yml up -d --force-recreate --build --renew-anon-volumes",
+    "provision:docker:await": "docker compose -f ./provision/docker/integration_test_db/docker-compose.yml exec -T postgres /root/wait-for-postgres.sh",
+    "provision:docker:down": "docker compose -f ./provision/docker/integration_test_db/docker-compose.yml down",
     "provision:schema:plan": "npx sql-schema-control plan -c provision/schema/control.yml",
     "provision:schema:apply": "npx sql-schema-control apply -c provision/schema/control.yml",
     "provision:integration-test-db": "npm run provision:docker:prepare && npm run provision:docker:up && npm run provision:docker:await && npm run provision:schema:plan && npm run provision:schema:apply && npm run provision:schema:plan",

diff --git a/src/practices/package-json-order/best-practice/package.json.declapract.test.ts b/src/practices/package-json-order/best-practice/package.json.declapract.test.ts
@@ -48,10 +48,10 @@ const exampleFoundContents = `
     "build:clean": "rm dist/ -rf",
     "build": "npm run build:clean && npm run build:compile",
     "provision:docker:prepare": "cp provision/schema/sql/init/.extensions.sql provision/docker/integration_test_db/init/ && cp provision/schema/sql/init/.schema.sql provision/docker/integration_test_db/init/ && cp provision/schema/sql/init/.user.cicd.sql provision/docker/integration_test_db/init/",
-    "provision:docker:up": "docker-compose -f ./provision/docker/integration_test_db/docker-compose.yml up -d --force-recreate --build --renew-anon-volumes",
+    "provision:docker:up": "docker compose -f ./provision/docker/integration_test_db/docker-compose.yml up -d --force-recreate --build --renew-anon-volumes",
     "build:compile": "tsc -p ./tsconfig.build.json",
-    "provision:docker:await": "docker-compose -f ./provision/docker/integration_test_db/docker-compose.yml exec -T postgres /root/wait-for-postgres.sh",
-    "provision:docker:down": "docker-compose -f ./provision/docker/integration_test_db/docker-compose.yml down",
+    "provision:docker:await": "docker compose -f ./provision/docker/integration_test_db/docker-compose.yml exec -T postgres /root/wait-for-postgres.sh",
+    "provision:docker:down": "docker compose -f ./provision/docker/integration_test_db/docker-compose.yml down",
     "provision:schema:plan": "npx sql-schema-control plan -c provision/schema/control.yml",
     "test:lint": "eslint -c ./.eslintrc.js src/**/*.ts",
     "provision:schema:apply": "npx sql-schema-control apply -c provision/schema/control.yml",

diff --git a/src/practices/persist-with-dynamodb/best-practice/package.json b/src/practices/persist-with-dynamodb/best-practice/package.json
@@ -7,8 +7,8 @@
   },
   "scripts": {
     "generate:dao:dynamodb": "npx dynamodb-dao-generator generate && npm run fix:format",
-    "provision:docker:up": "docker-compose -f ./provision/docker/integration-test-db/docker-compose.yml up -d --force-recreate --build --renew-anon-volumes",
-    "provision:docker:down": "docker-compose -f ./provision/docker/integration-test-db/docker-compose.yml down",
+    "provision:docker:up": "docker compose -f ./provision/docker/integration-test-db/docker-compose.yml up -d --force-recreate --build --renew-anon-volumes",
+    "provision:docker:down": "docker compose -f ./provision/docker/integration-test-db/docker-compose.yml down",
     "provision:dynamodb:schema": "terraform -chdir=provision/aws/environments/test apply -auto-approve",
     "provision:integration-test-db": "npm run provision:docker:up && npm run provision:dynamodb:schema"
   }

diff --git a/src/practices/persist-with-rds/best-practice/package.json b/src/practices/persist-with-rds/best-practice/package.json
@@ -18,9 +18,9 @@
     "generate:types-from-sql": "npx sql-code-generator generate -c codegen.sql.types.yml && npm run fix:format",
     "provision:docker:clear": "docker rm -f $(docker ps -a -f 'publish=7821' -q) 2>/dev/null || true && echo 'ensured port is available 👍'",
     "provision:docker:prepare": "cp provision/schema/sql/init/.extensions.sql provision/docker/integration-test-db/init/extensions.sql && cp provision/schema/sql/init/.schema.sql provision/docker/integration-test-db/init/schema.sql && cp provision/schema/sql/init/.user.cicd.sql provision/docker/integration-test-db/init/user.cicd.sql",
-    "provision:docker:up": "docker-compose -f ./provision/docker/integration-test-db/docker-compose.yml up -d --force-recreate --build --renew-anon-volumes",
-    "provision:docker:await": "docker-compose -f ./provision/docker/integration-test-db/docker-compose.yml exec -T postgres /root/wait-for-postgres.sh",
-    "provision:docker:down": "docker-compose -f ./provision/docker/integration-test-db/docker-compose.yml down",
+    "provision:docker:up": "docker compose -f ./provision/docker/integration-test-db/docker-compose.yml up -d --force-recreate --build --renew-anon-volumes",
+    "provision:docker:await": "docker compose -f ./provision/docker/integration-test-db/docker-compose.yml exec -T postgres /root/wait-for-postgres.sh",
+    "provision:docker:down": "docker compose -f ./provision/docker/integration-test-db/docker-compose.yml down",
     "provision:schema:plan": "npx sql-schema-control plan -c provision/schema/control.yml",
     "provision:schema:apply": "npx sql-schema-control apply -c provision/schema/control.yml",
     "provision:schema:sync": "npx sql-schema-control sync -c provision/schema/control.yml",