From e63ee83590facac142b91d7c20d8d7a5caded997 Mon Sep 17 00:00:00 2001 From: Tomasz Pluskiewicz Date: Mon, 23 Sep 2024 14:18:31 +0200 Subject: [PATCH] ci: docker-compose is deprecated --- .github/workflows/ci.yaml | 2 +- README.md | 2 +- cli/README.md | 6 +++--- package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b0bd700b1..00f707056 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,7 @@ jobs: - run: yarn seed-data - name: Hydra e2e tests - run: docker-compose -f docker-compose.yml -f docker-compose.posix.yml run e2e-tests + run: docker compose -f docker-compose.yml -f docker-compose.posix.yml run e2e-tests - name: core logs on fail if: ${{ failure() }} run: lando logs -s core diff --git a/README.md b/README.md index 03af437d8..858a23923 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ There are two types of e2e tests: ### API e2e tests -Running the E2E tests can be done using: `docker-compose run --rm e2e-tests`, and `docker-compose run --rm e2e-tests -- --grep pattern` lets you select which tests to run. +Running the E2E tests can be done using: `docker compose run --rm e2e-tests`, and `docker compose run --rm e2e-tests -- --grep pattern` lets you select which tests to run. For brevity, use npm script `npm run test:e2e --grep pattern` diff --git a/cli/README.md b/cli/README.md index 637bc3bd1..4a0e567cb 100644 --- a/cli/README.md +++ b/cli/README.md @@ -96,12 +96,12 @@ Here's an example of converting local files using a locally-built image: 1. (optionally) Ensure a fresh container is built ``` - docker-composer build cli + docker compose build cli ``` -1. Run with docker-compose +1. Run with `docker compose` ``` - docker-compose run --rm cli transform \ + docker compose run --rm cli transform \ --to filesystem \ --job --debug diff --git a/package.json b/package.json index 07d3073be..e4949e857 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test:cli:publish": "yarn c8 -o coverage/publish mocha --recursive cli/**/*.test.ts --grep @cube-creator/cli/lib/commands/publish", "test:cli:transform": "yarn c8 -o coverage/transform mocha --recursive cli/**/*.test.ts --grep @cube-creator/cli/lib/commands/transform", "test:cli:timeoutJobs": "yarn c8 -o coverage/transform mocha --recursive cli/**/*.test.ts --grep @cube-creator/cli/lib/commands/timeoutJobs", - "test:e2e": "docker-compose run --rm e2e-tests --", + "test:e2e": "docker compose run --rm e2e-tests --", "seed-data": "dotenv -e .local.env -- bash -c \"ts-node packages/testing/index.ts -i ubd dimensions px-cube hierarchies\"" }, "workspaces": [