Skip to content

Commit

Permalink
Use correct var for detecting MySQL
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeiP committed Oct 22, 2024
1 parent e70a569 commit d9d8aba
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion script/poll-for-db
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

echo "==> Polling DB…"

if [ "$DATABASE_TYPE" == "mysql" ]; then
if [ "$2" == "mysql" ]; then
appdir=$(cd $(dirname "$0")/.. && pwd)
[ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@

Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
args:
RUBY_VERSION: ${RUBY_VERSION}
environment:
# These are set in script/ci-build, so we need to pass-thru them.
# These are set in script/cibuild, so we need to pass-thru them.
RAILS_ENV: $RAILS_ENV
DATABASE_NAME: $DATABASE_NAME
DATABASE_USERNAME: root
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
args:
RUBY_VERSION: ${RUBY_VERSION}
environment:
# These are set in script/ci-build, so we need to pass-thru them.
# These are set in script/cibuild, so we need to pass-thru them.
RAILS_ENV: $RAILS_ENV
DATABASE_NAME: $DATABASE_NAME
DATABASE_USERNAME: postgres
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
args:
RUBY_VERSION: ${RUBY_VERSION}
environment:
# These are set in script/ci-build, so we need to pass-thru them.
# These are set in script/cibuild, so we need to pass-thru them.
RAILS_ENV: $RAILS_ENV
DATABASE_NAME: "/app/db/db.sqlite"
DATABASE_TYPE: sqlite3
Expand Down

0 comments on commit d9d8aba

Please sign in to comment.