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

Merge pull request #24 from dokku/josegonzalez-patch-1

Browse Source 
Fix overlapping exported config
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-23 15:07:41 -04:00
parent 1b53acf30a 12c7bef14c
commit d3e3a702fc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config
View File

@@ -1,10 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export MYSQL_IMAGE=${MYSQL_IMAGE:="mysql"} export MYSQL_IMAGE=${MYSQL_IMAGE:="mysql"}
export MYSQL_IMAGE_VERSION=${MYSQL_IMAGE_VERSION:="5.6.26"} 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_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_DATASTORE_PORTS=(3306)
export PLUGIN_DEFAULT_ALIAS="DATABASE" export PLUGIN_DEFAULT_ALIAS="DATABASE"
export PLUGIN_IMAGE=$MYSQL_IMAGE export PLUGIN_IMAGE=$MYSQL_IMAGE

3
tests/test_helper.bash
View File

@@ -8,7 +8,8 @@ export PLUGIN_PATH="$DOKKU_ROOT/plugins"
export PLUGIN_ENABLED_PATH="$PLUGIN_PATH" export PLUGIN_ENABLED_PATH="$PLUGIN_PATH"
export PLUGIN_AVAILABLE_PATH="$PLUGIN_PATH" export PLUGIN_AVAILABLE_PATH="$PLUGIN_PATH"
export PLUGIN_CORE_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 mkdir -p $PLUGIN_DATA_ROOT
rm -rf "${PLUGIN_DATA_ROOT:?}"/* rm -rf "${PLUGIN_DATA_ROOT:?}"/*