Skip to content

Commit

Permalink
More update docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
nanaya committed Dec 19, 2022
1 parent 39e7e71 commit fd7116c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion DEPLOYMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Note that as the actual process is run as non-root user, the files must be world

## Services

The image built serves multiple purposes, each can be run by passing the parameter when starting docker (or as command if using orchestration tools like docker-compose).
The image built serves multiple purposes, each can be run by passing the parameter when starting docker (or as command if using orchestration tools like docker compose).

There are three main commands:

Expand Down
2 changes: 1 addition & 1 deletion bin/docker_dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

cd "$(dirname "$0")/.."

./docker/development/prepare.sh && exec docker-compose up "$@"
./docker/development/prepare.sh && exec docker compose up "$@"
6 changes: 3 additions & 3 deletions docker/development/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ if [ ! -f artisan ]; then
fi

_run() {
docker-compose run --rm php "$@"
docker compose run --rm php "$@"
}

_run_dusk() {
docker-compose run --rm -e APP_ENV=dusk.local php "$@"
docker compose run --rm -e APP_ENV=dusk.local php "$@"
}

genkey=0
Expand Down Expand Up @@ -66,4 +66,4 @@ if [ ! -f .docker/.my.cnf ]; then
cp .docker/.my.cnf.example .docker/.my.cnf
fi

echo "Preparation completed. Adjust .env file if needed and run 'docker-compose up' followed by running migration."
echo "Preparation completed. Adjust .env file if needed and run 'docker compose up' followed by running migration."

0 comments on commit fd7116c

Please sign in to comment.