From a273767efce3b9381d094a740afff681862c2eb0 Mon Sep 17 00:00:00 2001 From: Utkarsh Patel Date: Wed, 13 Nov 2024 13:44:06 +0530 Subject: [PATCH] Use docker compose (with space) --- .github/workflows/docker-images.yml | 2 +- .github/workflows/test-deploy.yml | 2 +- .travis.yml | 2 +- package.json | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index c44e24c7..96f43015 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -32,7 +32,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build images - run: docker-compose build + run: docker compose build - name: Publish images if: github.ref_name == 'master' diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index a56438aa..1ca1d24c 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -41,7 +41,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Pull custom Docker images - run: docker-compose pull wordpress mkcert + run: docker compose pull wordpress mkcert - name: Install Node dependencies run: npm install --ignore-scripts diff --git a/.travis.yml b/.travis.yml index a431b35d..971d3154 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_install: install: - echo "$DOCKER_PASSWORD" | docker login ghcr.io -u "$DOCKER_USERNAME" --password-stdin || true - - docker-compose pull wordpress mkcert || true + - docker compose pull wordpress mkcert || true - npm install script: diff --git a/package.json b/package.json index 5a03436f..c34eeab1 100644 --- a/package.json +++ b/package.json @@ -17,13 +17,13 @@ "release": "composer release", "clean": "rm -rf node_modules plugins/vendor local/public/wp", "vip": "vip @devgo-vip", - "cli": "docker-compose run --rm --user=1000 --workdir=/var/www/html wordpress", + "cli": "docker compose run --rm --user=1000 --workdir=/var/www/html wordpress", "test": "npm run cli -- composer test --working-dir=wp-content", - "start": "docker-compose up --detach --remove-orphans --build", - "start-debug": "docker-compose up --remove-orphans --build", - "stop": "docker-compose down", + "start": "docker compose up --detach --remove-orphans --build", + "start-debug": "docker compose up --remove-orphans --build", + "stop": "docker compose down", "stop-all": "docker stop $(docker ps --all --quiet)", - "logs": "docker-compose logs --follow", + "logs": "docker compose logs --follow", "setup": "npm run cli -- wp core multisite-install", "deploy-staging": "./local/scripts/deploy.sh git@github.com:wpcomvip/devgo-vip.git develop", "deploy-production": "./local/scripts/deploy.sh git@github.com:wpcomvip/devgo-vip.git master",