Merge pull request #18 from FraaJad/master
Multiple service constraints. Volumes logic in stack state. Added configs key to docker-compose.yml.
diff --git a/docker/files/http-proxy.conf b/docker/files/http-proxy.conf
index 13d494d..9ae5c00 100644
--- a/docker/files/http-proxy.conf
+++ b/docker/files/http-proxy.conf
@@ -1,5 +1,11 @@
{%- from "docker/map.jinja" import host with context -%}
[Service]
+{%- if host.proxy.get('http') %}
Environment="HTTP_PROXY={{ host.proxy.http }}"
+{%- endif -%}
+{%- if host.proxy.get('https') %}
Environment="HTTPS_PROXY={{ host.proxy.https }}"
+{%- endif -%}
+{%- if host.proxy.get('no_proxy') %}
Environment="NO_PROXY={{ host.proxy.no_proxy|join(',') }}"
+{%- endif -%}
diff --git a/docker/host.sls b/docker/host.sls
index dbd2cc0..3a6d1d4 100644
--- a/docker/host.sls
+++ b/docker/host.sls
@@ -48,6 +48,8 @@
- makedirs: True
- require_in:
- service: docker_service
+ - watch_in:
+ - service: docker_service
{% else %}