Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for new docker compose #743

Merged
merged 1 commit into from
Aug 23, 2024
Merged

Update for new docker compose #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/architecture/decisions/0005-use-dotenv-for-managing-environment-variables.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Use DotEnv to load our environment variables.

Should Docker and Docker Compose be added to the project the environment
variables will need to be loaded with
`docker-compose up --env-file=.env.development` rather than `docker-compose.env`
`docker compose up --env-file=.env.development` rather than `docker-compose.env`
which is a pattern we have used. Having 2 files for managing environment
variables such as `.env*` and `docker-compose.env*` is undesirable due to the
overhead in keeping these in sync.
Expand Down
2 changes: 1 addition & 1 deletion script/ci/cibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

set -e

docker-compose -f docker-compose.ci.yml -p app build
docker compose -f docker-compose.ci.yml -p app build
2 changes: 1 addition & 1 deletion script/ci/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

set -e

docker-compose -f docker-compose.ci.yml \
docker compose -f docker-compose.ci.yml \
-p app \
run --rm test \
script/all/test "$@"
2 changes: 1 addition & 1 deletion script/docker/console
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ set -e
# Enable the running of this script from any subdirectory without moving to root
cd "$(dirname "$0")/../.."

docker-compose run --rm web bundle exec rails console
docker compose run --rm web bundle exec rails console
2 changes: 1 addition & 1 deletion script/docker/server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cd "$(dirname "$0")/../.."

# INFO: To enable debug prompts (with pry or byebug) we first start the process
# in the background and then use attach to create an interactive prompt.
docker-compose up --detach
docker compose up --detach

# TODO: Repace 'rails-template' with application name
docker attach rails-template_web_1
2 changes: 1 addition & 1 deletion script/docker/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cd "$(dirname "$0")/../.."

echo "==> Tearing down any previous application state..."
for file in docker-compose.yml docker-compose.test.yml; do
docker-compose -f $file down --rmi local --volumes --remove-orphans
docker compose -f $file down --rmi local --volumes --remove-orphans
done

script/docker/bootstrap --no-docker-cache
2 changes: 1 addition & 1 deletion script/docker/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ set -e
# Enable the running of this script from any subdirectory without moving to root
cd "$(dirname "$0")/../.."

docker-compose -f docker-compose.test.yml \
docker compose -f docker-compose.test.yml \
run --rm test \
script/all/test "$@"
Loading