From 9a338816c60ea382e7cb044fc3448a72a739ffd3 Mon Sep 17 00:00:00 2001 From: David Levine Date: Sat, 10 Aug 2024 10:46:40 +0000 Subject: [PATCH] ci: replace `docker-compose` with `docker compose` --- bin/run-docker.sh | 12 ++++++------ composer.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/run-docker.sh b/bin/run-docker.sh index 63f925c..fad67df 100644 --- a/bin/run-docker.sh +++ b/bin/run-docker.sh @@ -16,11 +16,11 @@ print_usage_instructions() { echo " composer build-app" echo " composer run-app" echo "" - echo " WP_VERSION=6.5 PHP_VERSION=8.2 composer build-app" - echo " WP_VERSION=6.5 PHP_VERSION=8.2 composer run-app" + echo " WP_VERSION=6.6 PHP_VERSION=8.2 composer build-app" + echo " WP_VERSION=6.6 PHP_VERSION=8.2 composer run-app" echo "" - echo " WP_VERSION=6.5 PHP_VERSION=8.2 bin/run-docker.sh build -a" - echo " WP_VERSION=6.5 PHP_VERSION=8.2 bin/run-docker.sh run -a" + echo " WP_VERSION=6.6 PHP_VERSION=8.2 bin/run-docker.sh build -a" + echo " WP_VERSION=6.6 PHP_VERSION=8.2 bin/run-docker.sh run -a" exit 1 } @@ -29,7 +29,7 @@ if [ $# -eq 0 ]; then fi TAG=${TAG-latest} -WP_VERSION=${WP_VERSION-6.5} +WP_VERSION=${WP_VERSION-6.6} PHP_VERSION=${PHP_VERSION-8.2} BUILD_NO_CACHE=${BUILD_NO_CACHE-} @@ -83,7 +83,7 @@ case "$subcommand" in WP_VERSION=${WP_VERSION} PHP_VERSION=${PHP_VERSION} docker compose up app ;; t) - docker-compose run --rm \ + docker compose run --rm \ -e COVERAGE=${COVERAGE-} \ -e USING_XDEBUG=${USING_XDEBUG-} \ -e DEBUG=${DEBUG-} \ diff --git a/composer.json b/composer.json index 3155b7f..ee1d1d4 100644 --- a/composer.json +++ b/composer.json @@ -100,7 +100,7 @@ "install-stan-env": "bash bin/install-stan-env.sh", "docker-build": "bash bin/run-docker.sh build", "docker-run": "bash bin/run-docker.sh run", - "docker-destroy": "docker-compose down", + "docker-destroy": "docker compose down", "build-and-run": [ "@docker-build", "@docker-run"