ci: replace docker-compose commands with docker compose

justlevine · justlevine · commit cc545dff80fc · 2024-08-02T23:26:36.000Z
diff --git a/bin/run-docker.sh b/bin/run-docker.sh
@@ -4,7 +4,7 @@ set -eu
 
 ##
 # Use this script through Composer scripts in the package.json.
-# To quickly build and run the docker-compose scripts for an app or automated testing
+# To quickly build and run the `docker compose` scripts for an app or automated testing
 # run the command below after run `composer install --no-dev` with the respectively
 # flag for what you need.
 ##
@@ -82,7 +82,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
@@ -70,7 +70,7 @@
 		"install-test-env": "bash bin/install-test-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"
diff --git a/docs/testing.md b/docs/testing.md
@@ -273,13 +273,13 @@ PHP_VERSION=8.1 WP_VERSION=6.0 SUITES=acceptance composer run-test
 Log into the docker shell prompt:
 
 ```shell
-docker-compose run --entrypoint bash -- testing
+docker compose run --entrypoint bash -- testing
 ```
 
 Specify the PHP and/or WordPress versions to use that environment. Environment must have been built previously using instructions above.
 
 ```shell
-PHP_VERSION=8.1 WP_VERSION=6.0 docker-compose run --entrypoint bash -- testing
+PHP_VERSION=8.1 WP_VERSION=6.0 docker compose run --entrypoint bash -- testing
 ```
 
 Run the setup script, which also runs the test suite.  This needs to be run at least once after logging into the docker bash shell prompt. If you log out, the settings are not saved and must be re-run after opening the docker shell prompt.
