Replace docker-compose by docker compose

moutyque · Sep 3, 2024 · 56a436b · 56a436b
1 parent 5dac384
commit 56a436b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.config/README.md b/.config/README.md
@@ -142,7 +142,7 @@ We need to update the `scripts` in the `package.json` to use the extended Webpac
 
 ### Configure grafana image to use when running docker
 
-By default, `grafana-enterprise` will be used as the docker image for all docker related commands. If you want to override this behavior, simply alter the `docker-compose.yaml` by adding the following build arg `grafana_image`.
+By default, `grafana-enterprise` will be used as the docker image for all docker related commands. If you want to override this behavior, simply alter the `docker compose.yaml` by adding the following build arg `grafana_image`.
 
 **Example:**
 
@@ -159,6 +159,6 @@ services:
  grafana_image: ${GRAFANA_IMAGE:-grafana}
 ```
 
-In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios.
+In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios.
 
 ---
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -169,8 +169,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
@@ -193,7 +193,7 @@ jobs:
  docker logs ovhcloudnetworkobservability-foobar-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/README.md b/README.md
@@ -16,12 +16,12 @@ npm run build
 npm run server
 ```
 
-### Use sankey plugin with docker-compose
+### Use sankey plugin with docker compose
 
 To display a sankey query you need the sankey plugin.
 You can download the plugin [here](https://grafana.com/grafana/plugins/netsage-sankey-panel/?tab=installation)
 Unzip the folder
-Add the path to the folder to docker-compose volumes:
+Add the path to the folder to docker compose volumes:
 `- /path/to/netsage-sankey-panel:/var/lib/grafana/plugins/netsage-sankey-panel`
 
 ## Add new data source

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
  "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .",
  "lint:fix": "npm run lint -- --fix",
  "e2e": "playwright test",
- "server": "docker-compose up --build",
+ "server": "docker compose up --build",
  "sign": "npx --yes @grafana/sign-plugin@latest",
  "prepare": "lezer-generator --typeScript src/codemirror/lang-filter/syntax.grammar -o src/codemirror/lang-filter/parser.ts"
  },