Skip to content

Commit

Permalink
ci: replace docker-compose with docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
justlevine committed Aug 10, 2024
1 parent 9fd2f1c commit 9a33881
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions bin/run-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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-}
Expand Down Expand Up @@ -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-} \
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 9a33881

Please sign in to comment.