Use docker compose V2

yo35 · Jul 29, 2024 · a6307a2 · a6307a2
1 parent 0403fd7
commit a6307a2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,9 +15,9 @@ jobs:
         with:
           node-version: latest
       - run: npm ci
-      - run: docker-compose -f scripts/docker-compose.yml up -d
+      - run: docker compose -f scripts/docker-compose.yml up -d
       - run: npm test
-      - run: docker-compose -f scripts/docker-compose.yml down
+      - run: docker compose -f scripts/docker-compose.yml down
         if: ${{ always() }}
       - uses: coverallsapp/github-action@v2
         with:

diff --git a/package.json b/package.json
@@ -84,8 +84,8 @@
         "preunit": "npm run build:lib && webpack --config scripts/test-headless.webpack.config.js && webpack --config scripts/test-graphic.webpack.config.js && rimraf build/graphic_output",
         "unit": "nyc mocha --enable-source-maps --bail --sort",
         "test": "npm run lint && npm run unit",
-        "test_env:start": "docker-compose -p kokopu-react-test-env -f scripts/docker-compose.yml up -d",
-        "test_env:stop": "docker-compose -p kokopu-react-test-env -f scripts/docker-compose.yml down",
+        "test_env:start": "docker compose -p kokopu-react-test-env -f scripts/docker-compose.yml up -d",
+        "test_env:stop": "docker compose -p kokopu-react-test-env -f scripts/docker-compose.yml down",
         "build": "npm run build:lib && npm run build:doc",
         "build:doc": "rimraf dist/docs && styleguidist build --config scripts/doc.styleguide.config.js && copyfiles -u 2 'doc_src/theming/*.png' dist/docs",
         "build:lib": "rimraf dist/lib && tsc --outDir dist/lib && copyfiles -u 1 'src/**/*.{css,png,woff,woff2}' dist/lib",

diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
   web-client:
     image: selenium/standalone-firefox:4.21.0-20240522 # https://github.com/SeleniumHQ/docker-selenium to get the latest version