diff --git a/config b/config index c15b2fb..8e71b9a 100644 --- a/config +++ b/config @@ -11,6 +11,8 @@ export PLUGIN_DATA_HOST_ROOT=$POSTGRES_HOST_ROOT export PLUGIN_DATASTORE_PORTS=(5432) export PLUGIN_DATASTORE_WAIT_PORT=5432 export PLUGIN_DEFAULT_ALIAS="DATABASE" +export PLUGIN_DISABLE_PULL=${POSTGRES_DISABLE_PULL:=} +export PLUGIN_DISABLE_PULL_VARIABLE="POSTGRES_DISABLE_PULL" export PLUGIN_ALT_ALIAS="DOKKU_POSTGRES" export PLUGIN_IMAGE=$POSTGRES_IMAGE export PLUGIN_IMAGE_VERSION=$POSTGRES_IMAGE_VERSION diff --git a/functions b/functions index c1f56e9..7f16a00 100755 --- a/functions +++ b/functions @@ -30,8 +30,8 @@ service_create() { service_parse_args "${@:2}" if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " ; then - if [[ "$POSTGRES_DISABLE_PULL" == "true" ]]; then - dokku_log_warn "POSTGRES_DISABLE_PULL environment variable detected. Not running pull command." 1>&2 + if [[ "$PLUGIN_DISABLE_PULL" == "true" ]]; then + dokku_log_warn "${PLUGIN_DISABLE_PULL_VARIABLE} environment variable detected. Not running pull command." 1>&2 dokku_log_warn " docker pull ${IMAGE}" 1>&2 dokku_log_warn "$PLUGIN_SERVICE service creation failed" exit 1 diff --git a/install b/install index dbcf005..a5cf182 100755 --- a/install +++ b/install @@ -5,8 +5,8 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x plugin-install() { pull-docker-image() { declare IMAGE="$1" - if [[ "$POSTGRES_DISABLE_PULL" == "true" ]]; then - echo " ! POSTGRES_DISABLE_PULL environment variable detected. Not running pull command." 1>&2 + if [[ "$PLUGIN_DISABLE_PULL" == "true" ]]; then + echo " ! ${PLUGIN_DISABLE_PULL_VARIABLE} environment variable detected. Not running pull command." 1>&2 echo " ! docker pull ${IMAGE}" 1>&2 return fi