From a3a4b8555828ca63a9f2f7b3f1ea9b8468712080 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Wed, 30 Jan 2019 14:28:43 +0100 Subject: [PATCH] fix: [apache] docker pull output would get added to apache config file content --- apache/hooks/web_proxy-relation-joined | 2 +- apache/lib/common | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/hooks/web_proxy-relation-joined b/apache/hooks/web_proxy-relation-joined index ecffa2c4..4e8bb865 100755 --- a/apache/hooks/web_proxy-relation-joined +++ b/apache/hooks/web_proxy-relation-joined @@ -5,7 +5,7 @@ set -e . lib/common -apache_proxy_dir +apache_proxy_dir || exit 1 APACHE_CORE_RULES=$(relation-get apache-core-rules 2>/dev/null) || true if [ "$APACHE_CORE_RULES" ]; then diff --git a/apache/lib/common b/apache/lib/common index 8ed0a294..82eb87cf 100644 --- a/apache/lib/common +++ b/apache/lib/common @@ -561,7 +561,7 @@ __vhost_proxy_statement() { ## First exposed port: base_image=$(service_base_docker_image "$BASE_SERVICE_NAME") || return 1 if ! docker_has_image "$base_image"; then - docker pull "$base_image" + docker pull "$base_image" >&2 fi first_exposed_port=$(image_exposed_ports_0 "$base_image" | tr '\0' '\n' | head -n 1 | cut -f 1 -d /) || return 1 if [ -z "$first_exposed_port" ]; then