diff --git a/common-functions b/common-functions index 6840b12..c0b316c 100755 --- a/common-functions +++ b/common-functions @@ -383,7 +383,7 @@ service_info() { local flag key valid_flags local flag_map=( - "--config-dir: ${SERVICE_ROOT}/config" + "--config-dir: ${SERVICE_ROOT}/${PLUGIN_CONFIG_SUFFIX}" "--data-dir: ${SERVICE_ROOT}/data" "--dsn: ${SERVICE_URL}" "--exposed-ports: $(service_exposed_ports "$SERVICE")" diff --git a/config b/config index 30f24de..1a2312f 100644 --- a/config +++ b/config @@ -21,6 +21,7 @@ export PLUGIN_SCHEME="postgres" export PLUGIN_SERVICE="Postgres" export PLUGIN_VARIABLE="POSTGRES" export PLUGIN_BASE_PATH="$PLUGIN_PATH" +export PLUGIN_CONFIG_SUFFIX="data" if [[ -n $DOKKU_API_VERSION ]]; then export PLUGIN_BASE_PATH="$PLUGIN_ENABLED_PATH" fi diff --git a/subcommands/destroy b/subcommands/destroy index b3c8902..e2f08d5 100755 --- a/subcommands/destroy +++ b/subcommands/destroy @@ -45,7 +45,7 @@ service-destroy-cmd() { service_container_rm "$SERVICE" dokku_log_verbose_quiet "Removing data" - docker run --rm -v "$SERVICE_HOST_ROOT/data:/data" -v "$SERVICE_HOST_ROOT/config:/config" "$PLUGIN_BUSYBOX_IMAGE" chmod 777 -R /config /data + docker run --rm -v "$SERVICE_HOST_ROOT/data:/data" -v "$SERVICE_HOST_ROOT/$PLUGIN_CONFIG_SUFFIX:/config" "$PLUGIN_BUSYBOX_IMAGE" chmod 777 -R /config /data rm -rf "$SERVICE_ROOT" dokku_log_info2 "$PLUGIN_SERVICE container deleted: $SERVICE"