fixed extra_hosts and global_env_vars defaults
This commit is contained in:
parent
430abff063
commit
90383ce9f1
@ -6,11 +6,11 @@ services:
|
|||||||
{% if container.active %}
|
{% if container.active %}
|
||||||
{{ container.service_name }}:
|
{{ container.service_name }}:
|
||||||
image: {{ container.image }}
|
image: {{ container.image }}
|
||||||
container_name: {{ container.container_name }}
|
container_name: {{ container.container_name | default(container.service_name) }}
|
||||||
{% if container.extra_hosts is defined %}
|
{% if container.extra_hosts is defined %}
|
||||||
extra_hosts:
|
extra_hosts:
|
||||||
{% for extra_host in extra_hosts %}
|
{% for host in container.extra_hosts %}
|
||||||
- {{ extra_host }}
|
- {{ host }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if container.network_mode is defined %}
|
{% if container.network_mode is defined %}
|
||||||
@ -36,7 +36,7 @@ services:
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% if ( container.environment is defined ) or ( container.include_global_env_vars is defined and container.include_global_env_vars) %}
|
{% if ( container.environment is defined ) or ( container.include_global_env_vars is defined and container.include_global_env_vars) %}
|
||||||
environment:
|
environment:
|
||||||
{% if container.include_global_env_vars %}
|
{% if container.include_global_env_vars | default(false) %}
|
||||||
{% for global_var in global_env_vars %}
|
{% for global_var in global_env_vars %}
|
||||||
- {{ global_var }}
|
- {{ global_var }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@ -87,4 +87,4 @@ services:
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
Loading…
x
Reference in New Issue
Block a user