From 0f4ff8b724cca21019026312009e12416abb6815 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 21 Mar 2016 18:57:14 -0700 Subject: [PATCH] no need for newlines in docker args --- plugins/config/docker-args-deploy | 4 ++-- plugins/docker-options/docker-args-deploy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/config/docker-args-deploy b/plugins/config/docker-args-deploy index b6d0bf534..8d2ab297e 100755 --- a/plugins/config/docker-args-deploy +++ b/plugins/config/docker-args-deploy @@ -15,9 +15,9 @@ config_docker_args() { config_export global | sed -e "s:^export ::g" -e "s:=':=:g" -e "s:'$::g" > "$DOCKERFILE_ENV_FILE" config_export app "$APP" | sed -e "s:^export ::g" -e "s:=':=:g" -e "s:'$::g" >> "$DOCKERFILE_ENV_FILE" - echo "$STDIN --env-file=$DOCKERFILE_ENV_FILE" + echo -n "$STDIN --env-file=$DOCKERFILE_ENV_FILE" else - echo "$STDIN" + echo -n "$STDIN" fi } diff --git a/plugins/docker-options/docker-args-deploy b/plugins/docker-options/docker-args-deploy index 7d71f39eb..608cf6ef8 100755 --- a/plugins/docker-options/docker-args-deploy +++ b/plugins/docker-options/docker-args-deploy @@ -72,7 +72,7 @@ docker_args() { done < "$PHASE_FILE_PATH" fi - echo "$STDIN$output" + echo -n "$STDIN$output" } docker_args "$@"