github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Declare and assign separately to avoid masking return values.

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2017-07-17 00:01:38 -06:00
committed by Alex Quick
parent fc1129c728
commit a137ed64dc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/config/docker-args-deploy
View File

@@ -5,12 +5,16 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
config_docker_args() { config_docker_args() {
declare desc="config docker-args plugin trigger" declare desc="config docker-args plugin trigger"
local trigger="$0 config_docker_args" declare APP="$1" IMAGE_TAG="$2"
local STDIN=$(cat); local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG") local ENV_ARGS IMAGE STDIN trigger
IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
STDIN=$(cat);
trigger="$0 config_docker_args"
verify_app_name "$APP" verify_app_name "$APP"
if ! is_image_herokuish_based "$IMAGE"; then if ! is_image_herokuish_based "$IMAGE"; then
local ENV_ARGS="$(config_export app "$APP" --format docker-args --merged)" ENV_ARGS="$(config_export app "$APP" --format docker-args --merged)"
echo -n "$STDIN $ENV_ARGS" echo -n "$STDIN $ENV_ARGS"
else else
echo -n "$STDIN" echo -n "$STDIN"