From c573398c35c31971b640413dbc5cddac137b5d81 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 23 Sep 2015 14:38:10 -0400 Subject: [PATCH] Fix overlapping exported config If using multiple official dokku datastorage plugins, it is possible to get into a case where the `PLUGIN_DATA_ROOT` would be set incorrectly for other plugins. Refs dokku/dokku-redis#20 --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config b/config index be4aa75..8d89043 100644 --- a/config +++ b/config @@ -1,10 +1,10 @@ #!/usr/bin/env bash export POSTGRES_IMAGE=${POSTGRES_IMAGE:="postgres"} export POSTGRES_IMAGE_VERSION=${POSTGRES_IMAGE_VERSION:="9.4.4"} -export POSTGRES_ROOT=/var/lib/dokku/services/postgres +export POSTGRES_ROOT=${POSTGRES_ROOT:="/var/lib/dokku/services/postgres"} export PLUGIN_COMMAND_PREFIX="postgres" -export PLUGIN_DATA_ROOT=${PLUGIN_DATA_ROOT:="$POSTGRES_ROOT"} +export PLUGIN_DATA_ROOT=$POSTGRES_ROOT export PLUGIN_DATASTORE_PORTS=(5432) export PLUGIN_DEFAULT_ALIAS="DATABASE" export PLUGIN_IMAGE=$POSTGRES_IMAGE