Switch to POSTGRES_DOCKER_ARGS variable
Previously extra command line arguments were passed after the command, based on the discussion in https://github.com/dokku/dokku-postgres/pull/40, it was agreed that using a single environment variable was more clear.
This commit is contained in:
11
commands
11
commands
@@ -31,12 +31,13 @@ case "$1" in
|
||||
touch "$LINKS_FILE"
|
||||
|
||||
dokku_log_info1 "Starting container"
|
||||
ENVIRONMENT=""
|
||||
for arg in "${@:2}"; do
|
||||
ENVIRONMENT="$ENVIRONMENT -e $arg"
|
||||
done
|
||||
if [ -n $POSTGRES_DOCKER_ARGS ]; then
|
||||
echo "$(echo $POSTGRES_DOCKER_ARGS | tr ',' "\n")" > "$SERVICE_ROOT/ENVIRONMENT"
|
||||
else
|
||||
echo "" > "$SERVICE_ROOT/ENVIRONMENT"
|
||||
fi
|
||||
SERVICE_NAME=$(get_service_name "$SERVICE")
|
||||
ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/var/lib/postgresql/data" $ENVIRONMENT -e "POSTGRES_PASSWORD=$password" -d --restart always --label dokku=service --label dokku.service=postgres "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION")
|
||||
ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/var/lib/postgresql/data" --env-file="$SERVICE_ROOT/ENVIRONMENT" -e "POSTGRES_PASSWORD=$password" -d --restart always --label dokku=service --label dokku.service=postgres "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION")
|
||||
echo "$ID" > "$SERVICE_ROOT/ID"
|
||||
|
||||
dokku_log_verbose_quiet "Waiting for container to be ready"
|
||||
|
||||
Reference in New Issue
Block a user