External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix dns and dns_search templating

Browse Source 
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.
This commit is contained in:
jffz 2018-03-09 11:04:26 +01:00 committed by GitHub
parent 8a25342ce5
commit ca27dee4fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
installer/local_docker/templates/docker-compose.yml.j2
View File

@ -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('') }}