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

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

Browse Source 
Fix overlapping exported config
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-23 15:08:23 -04:00
parent 5bd4f4f708 7c5cefb7c7
commit 7905c134e5
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 MONGO_IMAGE=${MONGO_IMAGE:="mongo"} export MONGO_IMAGE=${MONGO_IMAGE:="mongo"}
export MONGO_IMAGE_VERSION=${MONGO_IMAGE_VERSION:="3.0.6"} export MONGO_IMAGE_VERSION=${MONGO_IMAGE_VERSION:="3.0.6"}
export MONGO_ROOT=/var/lib/dokku/services/mongo export MONGO_ROOT=${MONGO_ROOT:="/var/lib/dokku/services/mongo"}
export PLUGIN_COMMAND_PREFIX="mongo" export PLUGIN_COMMAND_PREFIX="mongo"
export PLUGIN_DATA_ROOT=${PLUGIN_DATA_ROOT:="$MONGO_ROOT"} export PLUGIN_DATA_ROOT=$MONGO_ROOT
export PLUGIN_DATASTORE_PORTS=(27017 27018 27019 28017) export PLUGIN_DATASTORE_PORTS=(27017 27018 27019 28017)
export PLUGIN_DEFAULT_ALIAS="MONGO" export PLUGIN_DEFAULT_ALIAS="MONGO"
export PLUGIN_IMAGE=$MONGO_IMAGE export PLUGIN_IMAGE=$MONGO_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 MONGO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures"
export PLUGIN_DATA_ROOT="$MONGO_ROOT"
mkdir -p "$PLUGIN_DATA_ROOT" mkdir -p "$PLUGIN_DATA_ROOT"
rm -rf "${PLUGIN_DATA_ROOT:?}"/* rm -rf "${PLUGIN_DATA_ROOT:?}"/*