diff --git a/config b/config index 1d5622d..1712fc3 100644 --- a/config +++ b/config @@ -1,10 +1,10 @@ #!/usr/bin/env bash export MYSQL_IMAGE=${MYSQL_IMAGE:="mysql"} export MYSQL_IMAGE_VERSION=${MYSQL_IMAGE_VERSION:="5.6.26"} -export MYSQL_ROOT=/var/lib/dokku/services/mysql +export MYSQL_ROOT=${MYSQL_ROOT:="/var/lib/dokku/services/mysql"} export PLUGIN_COMMAND_PREFIX="mysql" -export PLUGIN_DATA_ROOT=${PLUGIN_DATA_ROOT:="$MYSQL_ROOT"} +export PLUGIN_DATA_ROOT=$MYSQL_ROOT export PLUGIN_DATASTORE_PORTS=(3306) export PLUGIN_DEFAULT_ALIAS="DATABASE" export PLUGIN_IMAGE=$MYSQL_IMAGE diff --git a/tests/test_helper.bash b/tests/test_helper.bash index 180fbc2..c825249 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 MYSQL_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures" +export PLUGIN_DATA_ROOT="$MYSQL_ROOT" mkdir -p $PLUGIN_DATA_ROOT rm -rf "${PLUGIN_DATA_ROOT:?}"/*