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

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

Browse Source 
Fix overlapping exported config
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-23 15:11:37 -04:00
parent 2cc967c1c5 37b84c3aa9
commit 624ed2592d
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
export REDIS_IMAGE=${REDIS_IMAGE:="redis"}
export REDIS_IMAGE_VERSION=${REDIS_IMAGE_VERSION:="3.0.4"}
export REDIS_ROOT=/var/lib/dokku/services/redis
export REDIS_ROOT=${REDIS_ROOT:="/var/lib/dokku/services/redis"}
export PLUGIN_COMMAND_PREFIX="redis"
export PLUGIN_DATA_ROOT=${PLUGIN_DATA_ROOT:="$REDIS_ROOT"}
export PLUGIN_DATA_ROOT=$REDIS_ROOT
export PLUGIN_DATASTORE_PORTS=(6379)
export PLUGIN_DEFAULT_ALIAS="REDIS"
export PLUGIN_IMAGE=$REDIS_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_AVAILABLE_PATH="$PLUGIN_PATH"
export PLUGIN_CORE_AVAILABLE_PATH="$PLUGIN_PATH"
export PLUGIN_DATA_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures"
export REDIS_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures"
export PLUGIN_DATA_ROOT="$REDIS_ROOT"
mkdir -p "$PLUGIN_DATA_ROOT"
rm -rf "${PLUGIN_DATA_ROOT:?}"/*