dokku/dokku-postgres
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to POSTGRES_DOCKER_ARGS variable

Browse Source 
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:
Matt Colyer
2015-11-02 21:03:38 -08:00
parent a71847cc1e
commit 50f980ce03
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -24,7 +24,7 @@ dokku plugin:install https://github.com/dokku/dokku-postgres.git postgres
``` ```
postgres:clone <name> <new-name> Create container <new-name> then copy data from <name> into <new-name> postgres:clone <name> <new-name> Create container <new-name> then copy data from <name> into <new-name>
postgres:connect <name> Connect via psql to a postgres service postgres:connect <name> Connect via psql to a postgres service
postgres:create <name> <env=val> Create a postgres service with environment variables postgres:create <name> Create a postgres service with environment variables
postgres:destroy <name> Delete the service and stop its container if there are no links left postgres:destroy <name> Delete the service and stop its container if there are no links left
postgres:export <name> Export a dump of the postgres service database postgres:export <name> Export a dump of the postgres service database
postgres:expose <name> [port] Expose a postgres service on custom port if provided (random port otherwise) postgres:expose <name> [port] Expose a postgres service on custom port if provided (random port otherwise)
@@ -52,6 +52,7 @@ dokku postgres:create lolipop
# official postgres image # official postgres image
export POSTGRES_IMAGE="postgres" export POSTGRES_IMAGE="postgres"
export POSTGRES_IMAGE_VERSION="9.4.4" export POSTGRES_IMAGE_VERSION="9.4.4"
export POSTGRES_DOCKER_ARGS="USER=alpha;HOST=beta"
dokku postgres:create lolipop dokku postgres:create lolipop
# get connection information as follows # get connection information as follows

11
commands
View File

@@ -31,12 +31,13 @@ case "$1" in
touch "$LINKS_FILE" touch "$LINKS_FILE"
dokku_log_info1 "Starting container" dokku_log_info1 "Starting container"
ENVIRONMENT="" if [ -n $POSTGRES_DOCKER_ARGS ]; then
for arg in "${@:2}"; do echo "$(echo $POSTGRES_DOCKER_ARGS | tr ',' "\n")" > "$SERVICE_ROOT/ENVIRONMENT"
ENVIRONMENT="$ENVIRONMENT -e $arg" else
done echo "" > "$SERVICE_ROOT/ENVIRONMENT"
fi
SERVICE_NAME=$(get_service_name "$SERVICE") 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" echo "$ID" > "$SERVICE_ROOT/ID"
dokku_log_verbose_quiet "Waiting for container to be ready" dokku_log_verbose_quiet "Waiting for container to be ready"