Fix usage of variables for fixed values

Some values which are fixed by the docker compose file should not be set
as variables, and hardcoded everywhere as required.

This also untangles the use of the variables DB_HOST and DB_PORT to be
only about the exposed hostname and port, whenever the DB engine is
exposed on the server interface.
This commit is contained in:
2018-02-22 16:57:22 +01:00
parent 3d77367002
commit b290512265
4 changed files with 25 additions and 25 deletions

View File

@@ -46,7 +46,7 @@ db_id=$(docker run --rm -d \
-v ${DB_DATA}:/data:rw \
-v ${DB_DATASETS}:/datasets:ro \
--network=${MIP_PRIVATE_NETWORK} \
--name ${DB_HOST} \
--name db \
${DB_IMAGE}${DB_VERSION}
)
@@ -64,8 +64,8 @@ done
sleep 5
docker run --rm \
-e DB_HOST="${DB_HOST}" \
-e DB_PORT="${DB_PORT}" \
-e DB_HOST="db" \
-e DB_PORT="5432" \
-e DB_ADMIN_USER="${DB_USER_ADMIN}" \
-e DB_ADMIN_PASSWORD="${DB_PASSWORD_ADMIN}" \
${db_list} \
@@ -83,8 +83,8 @@ do
echo "Executing ${img}${version}"
docker run --rm \
-e FLYWAY_HOST="${DB_HOST}" \
-e FLYWAY_PORT="${DB_PORT}" \
-e FLYWAY_HOST="db" \
-e FLYWAY_PORT="5432" \
-e FLYWAY_USER="${DB_USER_ADMIN}" \
-e FLYWAY_PASSWORD="${DB_PASSWORD_ADMIN}" \
-e FLYWAY_DATABASE_NAME="${db}" \