From a4200c843e4e0520ea50ded6c550aba8cd47fe01 Mon Sep 17 00:00:00 2001 From: Myriam Gantner <48029745+MGJamJam@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:58:19 +0200 Subject: [PATCH] migrate docker-compose to docker compose (#99) --- .github/workflows/ci.yml | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5496de0..08b9d0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -152,8 +152,8 @@ jobs: - name: Start Grafana run: | - docker-compose pull - DEVELOPMENT=false GRAFANA_VERSION=${{ matrix.GRAFANA_IMAGE.VERSION }} GRAFANA_IMAGE=${{ matrix.GRAFANA_IMAGE.NAME }} docker-compose up -d + docker compose pull + DEVELOPMENT=false GRAFANA_VERSION=${{ matrix.GRAFANA_IMAGE.VERSION }} GRAFANA_IMAGE=${{ matrix.GRAFANA_IMAGE.NAME }} docker compose up -d - name: Wait for Grafana to start uses: nev7n/wait_for_response@v1 @@ -176,7 +176,7 @@ jobs: docker logs test-test-datasource >& grafana-server.log - name: Stop grafana docker - run: docker-compose down + run: docker compose down - name: Upload server log uses: actions/upload-artifact@v4 diff --git a/package.json b/package.json index 6126762..ef9ba40 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "format": "yarn prettier . --write", "format:check": "yarn prettier --check .", "e2e": "yarn playwright test", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest" }, "author": "Bitmovin",