dokku/dokku-redis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #57 from dokku/check-docker-option-calls

Browse Source 
Fix calls to docker-options plugin under all 0.4.x releases
This commit is contained in:
Jose Diaz-Gonzalez
2016-06-22 15:16:46 -04:00
committed by GitHub
parent cacef19db7 79e44c834f
commit cb5d451bbc
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -4,5 +4,6 @@ language: bash
env: env:
- DOKKU_VERSION=master - DOKKU_VERSION=master
- DOKKU_VERSION=v0.4.14 - DOKKU_VERSION=v0.4.14
- DOKKU_VERSION=v0.4.0
before_install: make setup before_install: make setup
script: make test script: make test

24
functions
View File

@@ -2,7 +2,9 @@
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config" source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_AVAILABLE_PATH/config/functions" source "$PLUGIN_AVAILABLE_PATH/config/functions"
source "$PLUGIN_AVAILABLE_PATH/docker-options/functions" if [[ -f "$PLUGIN_AVAILABLE_PATH/docker-options/functions" ]]; then
source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
fi
docker_ports_options() { docker_ports_options() {
local PORTS=("$@") local PORTS=("$@")
@@ -167,9 +169,13 @@ service_link() {
ALIAS=$(service_alternative_alias "$EXISTING_CONFIG") ALIAS=$(service_alternative_alias "$EXISTING_CONFIG")
fi fi
# shellcheck disable=SC2034 if declare -f -F add_passed_docker_option > /dev/null; then
local passed_phases=(build deploy run) # shellcheck disable=SC2034
add_passed_docker_option passed_phases[@] "--link $SERVICE_NAME:$SERVICE_ALIAS" local passed_phases=(build deploy run)
add_passed_docker_option passed_phases[@] "--link $SERVICE_NAME:$SERVICE_ALIAS"
else
dokku docker-options:add "$APP" build,deploy,run "--link $SERVICE_NAME:$SERVICE_ALIAS"
fi
config_set "$APP" "${ALIAS}_URL=$SERVICE_URL" config_set "$APP" "${ALIAS}_URL=$SERVICE_URL"
} }
@@ -328,9 +334,13 @@ service_unlink() {
[[ -z ${LINK[*]} ]] && dokku_log_fail "Not linked to app $APP" [[ -z ${LINK[*]} ]] && dokku_log_fail "Not linked to app $APP"
remove_from_links_file "$SERVICE" "$APP" remove_from_links_file "$SERVICE" "$APP"
# shellcheck disable=SC2034 if declare -f -F add_passed_docker_option > /dev/null; then
local passed_phases=(build deploy run) # shellcheck disable=SC2034
remove_passed_docker_option passed_phases[@] "--link $SERVICE_NAME:$SERVICE_ALIAS" local passed_phases=(build deploy run)
remove_passed_docker_option passed_phases[@] "--link $SERVICE_NAME:$SERVICE_ALIAS"
else
dokku docker-options:remove "$APP" build,deploy,run "--link $SERVICE_NAME:$SERVICE_ALIAS"
fi
config_unset "$APP" "${LINK[*]}" config_unset "$APP" "${LINK[*]}"
} }