From 9146dd21d3cf631771a2affc1615f6d9dddeee75 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 23 Sep 2015 14:37:44 -0400 Subject: [PATCH] Fix overlapping exported config If using multiple official dokku datastorage plugins, it is possible to get into a case where the `PLUGIN_DATA_ROOT` would be set incorrectly for other plugins. Refs dokku/dokku-redis#20 --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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