External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1754 from ansible/fix-docker-compose-template

Browse Source 
Fix whitespace issues with docker-compose jinja template
This commit is contained in:
Shane McDonald
2018-04-11 12:38:09 -04:00
committed by GitHub
parent 538bf40f96 3720c57c63
commit b0425d524c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,8 +39,8 @@ services:
{% for awx_alternate_dns_server in awx_alternate_dns_servers_list %} {% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
- {{ awx_alternate_dns_server }} - {{ awx_alternate_dns_server }}
{% endfor %} {% endfor %}
{% elif awx_alternate_dns_servers is defined -%} {% elif awx_alternate_dns_servers is defined %}
dns: "{{ awx_alternate_dns_servers }}" dns: "{{ awx_alternate_dns_servers }}"
{% endif %} {% endif %}
environment: environment:
http_proxy: {{ http_proxy | default('') }} http_proxy: {{ http_proxy | default('') }}
@@ -98,7 +98,7 @@ services:
{% for awx_alternate_dns_server in awx_alternate_dns_servers_list %} {% for awx_alternate_dns_server in awx_alternate_dns_servers_list %}
- {{ awx_alternate_dns_server }} - {{ awx_alternate_dns_server }}
{% endfor %} {% endfor %}
{% elif awx_alternate_dns_servers is defined -%} {% elif awx_alternate_dns_servers is defined %}
dns: "{{ awx_alternate_dns_servers }}" dns: "{{ awx_alternate_dns_servers }}"
{% endif %} {% endif %}
environment: environment: