use correct env var and fix bash nounset issue

This commit is contained in:
burnettk 2022-06-20 22:56:50 -04:00
parent 9894b82ab9
commit 6fae660772
2 changed files with 2 additions and 2 deletions

View File

@ -70,7 +70,7 @@ jobs:
SPIFF_DATABASE_TYPE: ${{ matrix.database }} SPIFF_DATABASE_TYPE: ${{ matrix.database }}
FORCE_COLOR: "1" FORCE_COLOR: "1"
PRE_COMMIT_COLOR: "always" PRE_COMMIT_COLOR: "always"
MYSQL_PASSWORD: password DB_PASSWORD: password
FLASK_SESSION_SECRET_KEY: super_secret_key FLASK_SESSION_SECRET_KEY: super_secret_key
steps: steps:

View File

@ -22,7 +22,7 @@ if [[ "${1:-}" == "clean" ]]; then
# TODO: check to see if the db already exists and we can connect to it. also actually clean it up. # TODO: check to see if the db already exists and we can connect to it. also actually clean it up.
# start postgres in background with one db # start postgres in background with one db
if [[ "$SPIFF_DATABASE_TYPE" == "postgres" ]]; then if [[ "${SPIFF_DATABASE_TYPE:-}" == "postgres" ]]; then
if ! docker exec -it postgres-spiff psql -U spiffworkflow_backend spiffworkflow_backend_testing -c "select 1"; then if ! docker exec -it postgres-spiff psql -U spiffworkflow_backend spiffworkflow_backend_testing -c "select 1"; then
docker run --name postgres-spiff -p 5432:5432 -e POSTGRES_PASSWORD=spiffworkflow_backend -e POSTGRES_USER=spiffworkflow_backend -e POSTGRES_DB=spiffworkflow_backend_testing -d postgres docker run --name postgres-spiff -p 5432:5432 -e POSTGRES_PASSWORD=spiffworkflow_backend -e POSTGRES_USER=spiffworkflow_backend -e POSTGRES_DB=spiffworkflow_backend_testing -d postgres