diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-12-10 16:52:07 +0100 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-12-10 17:07:19 +0100 |
| commit | 7bf78e1771b008ef0ab0bb62122e1197629f1b1f (patch) | |
| tree | f8c6329a80e7f92ac15ccf41a9cd5bb99710b0b0 | |
| parent | e14861637d45e845b880c051421ed3fe89bd5e62 (diff) | |
Fix "run-docker.sh" with PostgreSQL 10.5
In the original "fix" (spoiler alert: the fix was wrong) "POSTGRES_DB"
ended being empty due to "$DATABASE_NAME_dummy" being parsed as a full
variable name, instead of "$DATABASE_NAME" followed by the string
"_dummy".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| -rwxr-xr-x | tests/integration/run-docker.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/integration/run-docker.sh b/tests/integration/run-docker.sh index 476711227..fa57e72e9 100755 --- a/tests/integration/run-docker.sh +++ b/tests/integration/run-docker.sh @@ -99,7 +99,7 @@ function prepareDatabase() { DATABASE_CONTAINER_OPTIONS="--env MYSQL_ROOT_PASSWORD=nextcloud_root --env MYSQL_USER=$DATABASE_USER --env MYSQL_PASSWORD=$DATABASE_PASSWORD --env MYSQL_DATABASE=$DATABASE_NAME" if [ "$DATABASE" = "pgsql" ]; then - DATABASE_CONTAINER_OPTIONS=" --env POSTGRES_USER=$DATABASE_USER --env POSTGRES_PASSWORD=$DATABASE_PASSWORD --env POSTGRES_DB=$DATABASE_NAME_dummy" + DATABASE_CONTAINER_OPTIONS=" --env POSTGRES_USER=$DATABASE_USER --env POSTGRES_PASSWORD=$DATABASE_PASSWORD --env POSTGRES_DB=${DATABASE_NAME}_dummy" fi echo "Starting database server" |