diff --git a/config b/config index b371f68..d91fa6d 100644 --- a/config +++ b/config @@ -2,10 +2,12 @@ export MONGO_IMAGE=${MONGO_IMAGE:="mongo"} export MONGO_IMAGE_VERSION=${MONGO_IMAGE_VERSION:="3.4.9"} export MONGO_ROOT=${MONGO_ROOT:="/var/lib/dokku/services/mongo"} +export MONGO_HOST_ROOT=${MONGO_HOST_ROOT:=$MONGO_ROOT} export PLUGIN_COMMAND_PREFIX="mongo" export PLUGIN_CONFIG_ROOT=${PLUGIN_CONFIG_ROOT:="$DOKKU_LIB_ROOT/config/$PLUGIN_COMMAND_PREFIX"} export PLUGIN_DATA_ROOT=$MONGO_ROOT +export PLUGIN_DATA_HOST_ROOT=$MONGO_HOST_ROOT export PLUGIN_DATASTORE_PORTS=(27017 27018 27019 28017) export PLUGIN_DATASTORE_WAIT_PORT=27017 export PLUGIN_DEFAULT_ALIAS="MONGO" diff --git a/functions b/functions index 77fb838..76c1549 100755 --- a/functions +++ b/functions @@ -71,6 +71,7 @@ service_create() { service_create_container() { local SERVICE="$1" local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" + local SERVICE_HOST_ROOT="$PLUGIN_DATA_HOST_ROOT/$SERVICE" local SERVICE_NAME="$(get_service_name "$SERVICE")" local ROOTPASSWORD="$(cat "$SERVICE_ROOT/ROOTPASSWORD")" local PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")" @@ -80,7 +81,7 @@ service_create_container() { fi # shellcheck disable=SC2086 - ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/data/db" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=mongo "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" mongod $MONGO_CONFIG_OPTIONS) + ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_HOST_ROOT/data:/data/db" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=mongo "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" mongod $MONGO_CONFIG_OPTIONS) echo "$ID" > "$SERVICE_ROOT/ID" dokku_log_verbose_quiet "Waiting for container to be ready" @@ -107,9 +108,10 @@ service_export() { service_import() { local SERVICE="$1" - SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" - SERVICE_NAME="$(get_service_name "$SERVICE")" - PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")" + local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" + local SERVICE_HOST_ROOT="$PLUGIN_DATA_HOST_ROOT/$SERVICE" + local SERVICE_NAME="$(get_service_name "$SERVICE")" + local PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")" if [[ -t 0 ]]; then dokku_log_fail "No data provided on stdin." diff --git a/subcommands/destroy b/subcommands/destroy index abdbc65..a022b9b 100755 --- a/subcommands/destroy +++ b/subcommands/destroy @@ -16,6 +16,7 @@ service-destroy-cmd() { [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" verify_service_name "$SERVICE" SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS" + SERVICE_HOST_ROOT="$PLUGIN_DATA_HOST_ROOT/$SERVICE" SERVICE_NAME="$(get_service_name "$SERVICE")" [[ -s "$LINKS_FILE" ]] && dokku_log_fail "Cannot delete linked service" @@ -50,7 +51,7 @@ service-destroy-cmd() { fi dokku_log_verbose_quiet "Removing data" - docker run --rm -v "$SERVICE_ROOT/data:/data" -v "$SERVICE_ROOT/config:/config" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" chmod 777 -R /config /data + docker run --rm -v "$SERVICE_HOST_ROOT/data:/data" -v "$SERVICE_HOST_ROOT/config:/config" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" chmod 777 -R /config /data rm -rf "$SERVICE_ROOT" dokku_log_info2 "$PLUGIN_SERVICE container deleted: $SERVICE"