Browse Source

fix: [apache] docker pull output would get added to apache config file content

framadate
Valentin Lab 6 years ago
parent
commit
a3a4b85558
  1. 2
      apache/hooks/web_proxy-relation-joined
  2. 2
      apache/lib/common

2
apache/hooks/web_proxy-relation-joined

@ -5,7 +5,7 @@ set -e
. lib/common . lib/common
apache_proxy_dir
apache_proxy_dir || exit 1
APACHE_CORE_RULES=$(relation-get apache-core-rules 2>/dev/null) || true APACHE_CORE_RULES=$(relation-get apache-core-rules 2>/dev/null) || true
if [ "$APACHE_CORE_RULES" ]; then if [ "$APACHE_CORE_RULES" ]; then

2
apache/lib/common

@ -561,7 +561,7 @@ __vhost_proxy_statement() {
## First exposed port: ## First exposed port:
base_image=$(service_base_docker_image "$BASE_SERVICE_NAME") || return 1 base_image=$(service_base_docker_image "$BASE_SERVICE_NAME") || return 1
if ! docker_has_image "$base_image"; then if ! docker_has_image "$base_image"; then
docker pull "$base_image"
docker pull "$base_image" >&2
fi fi
first_exposed_port=$(image_exposed_ports_0 "$base_image" | tr '\0' '\n' | head -n 1 | cut -f 1 -d /) || return 1 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 if [ -z "$first_exposed_port" ]; then

Loading…
Cancel
Save