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 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:?}"/*