From c573398c35c31971b640413dbc5cddac137b5d81 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 23 Sep 2015 14:38:10 -0400 Subject: [PATCH 1/2] 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 From b8abc90885f3bd7e08f7bcf1c3a938cc110b000d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 23 Sep 2015 15:04:10 -0400 Subject: [PATCH 2/2] Set POSTGRES_ROOT environment variable as well Since PLUGIN_DATA_ROOT is not directly overrideable anymore, we need to *also* set this env var here. --- tests/test_helper.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_helper.bash b/tests/test_helper.bash index 4138720..5b7aede 100644 --- a/tests/test_helper.bash +++ b/tests/test_helper.bash @@ -8,7 +8,8 @@ export PLUGIN_PATH="$DOKKU_ROOT/plugins" export PLUGIN_ENABLED_PATH="$PLUGIN_PATH" export PLUGIN_AVAILABLE_PATH="$PLUGIN_PATH" export PLUGIN_CORE_AVAILABLE_PATH="$PLUGIN_PATH" -export PLUGIN_DATA_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures" +export POSTGRES_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures" +export PLUGIN_DATA_ROOT="$POSTGRES_ROOT" mkdir -p "$PLUGIN_DATA_ROOT" rm -rf "${PLUGIN_DATA_ROOT:?}"/*