Use central config for env vars

This commit is contained in:
Jose Diaz-Gonzalez
2015-08-29 01:53:34 -04:00
parent e0c9f6b7f4
commit 972af5b984
5 changed files with 7 additions and 25 deletions

View File

@@ -2,16 +2,7 @@
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname "$0")/../common/functions" source "$(dirname "$0")/../common/functions"
source "$(dirname "$0")/functions" source "$(dirname "$0")/functions"
source "$(dirname "$0")/config"
POSTGRES_IMAGE=${POSTGRES_IMAGE:="postgres"}
POSTGRES_IMAGE_VERSION=${POSTGRES_IMAGE_VERSION:="9.5"}
POSTGRES_ROOT=/var/lib/dokku/services/postgres
PLUGIN_COMMAND_PREFIX="postgres"
PLUGIN_DATA_ROOT=$POSTGRES_ROOT
PLUGIN_SERVICE="Postgres"
PLUGIN_IMAGE=$POSTGRES_IMAGE
PLUGIN_IMAGE_VERSION=$POSTGRES_IMAGE_VERSION
if [[ ! -d $PLUGIN_DATA_ROOT ]]; then if [[ ! -d $PLUGIN_DATA_ROOT ]]; then
dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install" dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install"

View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname "$0")/config"
case "$DOKKU_DISTRO" in case "$DOKKU_DISTRO" in
ubuntu) ubuntu)

View File

@@ -2,10 +2,10 @@
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname "$0")/../common/functions" source "$(dirname "$0")/../common/functions"
source "$(dirname "$0")/functions" source "$(dirname "$0")/functions"
source "$(dirname "$0")/config"
STDIN=$(cat) STDIN=$(cat)
APP="$1" APP="$1"
PLUGIN_DATA_ROOT=/var/lib/dokku/services/postgres
output="" output=""
for i in $PLUGIN_DATA_ROOT/*; do for i in $PLUGIN_DATA_ROOT/*; do

View File

@@ -1,8 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname "$0")/config"
PLUGIN_DATA_ROOT=/var/lib/dokku/services/postgres
PLUGIN_SERVICE="Postgres"
get_random_port() { get_random_port() {
local port=$RANDOM local port=$RANDOM
@@ -38,7 +36,7 @@ service_alias() {
if [[ -f "$ALIAS_FILE" ]]; then if [[ -f "$ALIAS_FILE" ]]; then
cat "$ALIAS_FILE" cat "$ALIAS_FILE"
else else
echo "DATABASE" echo "$PLUGIN_DEFAULT_ALIAS"
fi fi
} }
@@ -50,5 +48,5 @@ service_url() {
local ID="$(cat "$SERVICE_ROOT/ID")" local ID="$(cat "$SERVICE_ROOT/ID")"
local IP="$(get_container_ip "$ID")" local IP="$(get_container_ip "$ID")"
local PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")" local PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
echo "postgres://postgres:$PASSWORD@$IP:5432/$SERVICE" echo "$PLUGIN_SCHEME://postgres:$PASSWORD@$IP:$PLUGIN_DATASTORE_PORT/$SERVICE"
} }

10
install
View File

@@ -1,14 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname "$0")/config"
POSTGRES_IMAGE="postgres"
POSTGRES_IMAGE_VERSION=9.5
POSTGRES_ROOT=/var/lib/dokku/services/postgres
PLUGIN_DATA_ROOT=$POSTGRES_ROOT
PLUGIN_SERVICE="Postgres"
PLUGIN_IMAGE=$POSTGRES_IMAGE
PLUGIN_IMAGE_VERSION=$POSTGRES_IMAGE_VERSION
if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q $PLUGIN_IMAGE_VERSION ; then if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q $PLUGIN_IMAGE_VERSION ; then
docker pull $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION docker pull $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION