From ca27dee4fcad0a72b16a131c60c99acc28587442 Mon Sep 17 00:00:00 2001
From: jffz <bachelotg@gmail.com>
Date: Fri, 9 Mar 2018 11:04:26 +0100
Subject: [PATCH] Fix dns and dns_search templating

Fix templating for dns and dns_search entries for both `awx_web` and `awx_task` images.

Multiple entries were templated in a oneliner style while docker-compose wanted them in a list style.
---
 .../templates/docker-compose.yml.j2           | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/installer/local_docker/templates/docker-compose.yml.j2 b/installer/local_docker/templates/docker-compose.yml.j2
index 02f620a9a6..a97b711300 100644
--- a/installer/local_docker/templates/docker-compose.yml.j2
+++ b/installer/local_docker/templates/docker-compose.yml.j2
@@ -15,12 +15,24 @@ services:
     hostname: awxweb
     user: root
     restart: unless-stopped
-    {% if awx_container_search_domains is defined %}
+    {% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) -%}
+    {% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}
+    dns_search:
+    {% for awx_container_search_domain in awx_container_search_domains_list %}
+      - {{ awx_container_search_domain }}
+    {% endfor %}
+    {% elif awx_container_search_domains is defined -%}
     dns_search: "{{ awx_container_search_domains }}"
-    {% endif %}
-    {% if awx_container_search_domains is defined %}
+    {%- endif %}
+    {% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) -%}
+    {% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %}
+    dns:
+    {% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
+      - {{ awx_alternate_dns_server }}
+    {% endfor %}
+    {% elif awx_alternate_dns_servers is defined -%}
     dns: "{{ awx_alternate_dns_servers }}"
-    {% endif %}
+    {%- endif %}
     environment:
       http_proxy: {{ http_proxy | default('') }}
       https_proxy: {{ https_proxy | default('') }}
@@ -53,12 +65,24 @@ services:
     hostname: awx
     user: root
     restart: unless-stopped
-    {% if awx_container_search_domains is defined %}
+    {% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) -%}    
+    {% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}
+    dns_search:
+    {% for awx_container_search_domain in awx_container_search_domains_list %}
+      - {{ awx_container_search_domain }}
+    {% endfor %}
+    {% elif awx_container_search_domains is defined -%}
     dns_search: "{{ awx_container_search_domains }}"
-    {% endif %}
-    {% if awx_container_search_domains is defined %}
+    {%- endif %}
+    {% if (awx_alternate_dns_servers is defined) and (',' in awx_alternate_dns_servers) -%}
+    {% set awx_alternate_dns_servers_list = awx_alternate_dns_servers.split(',') %}
+    dns:
+    {% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
+      - {{ awx_alternate_dns_server }}
+    {% endfor %}
+    {% elif awx_alternate_dns_servers is defined -%}
     dns: "{{ awx_alternate_dns_servers }}"
-    {% endif %}
+    {%- endif %}
     environment:
       http_proxy: {{ http_proxy | default('') }}
       https_proxy: {{ https_proxy | default('') }}