Set env_file option
diff --git a/docker/client/compose.sls b/docker/client/compose.sls
index 6c0eb88..22cdd47 100644
--- a/docker/client/compose.sls
+++ b/docker/client/compose.sls
@@ -51,7 +51,7 @@
- source: salt://docker/files/docker-compose.yml
- template: jinja
- defaults:
- app: {{ app }}
+ compose: {{ compose }}
service: {{ compose.service }}
- require:
- file: docker_{{ app }}_dir
diff --git a/docker/files/docker-compose.yml b/docker/files/docker-compose.yml
index eb92739..81de7ed 100644
--- a/docker/files/docker-compose.yml
+++ b/docker/files/docker-compose.yml
@@ -1,10 +1,15 @@
version: '2'
services:
{%- for name, srv in service.iteritems() %}
+ {%- set env_file_set = False %}
{{ name }}:
{%- for key, value in srv.iteritems() %}
+ {%- if key == 'env_file' %}{%- set env_file_set = True %}{%- endif %}
{{ key }}: {{ value }}
{%- endfor %}
+ {%- if not env_file_set and compose.environment is defined %}
+ env_file: .env
+ {%- endif %}
{%- endfor %}
{#-
diff --git a/docker/files/docker-env b/docker/files/docker-env
index 552a8ee..1711031 100644
--- a/docker/files/docker-env
+++ b/docker/files/docker-env
@@ -1,5 +1,5 @@
{%- for key, value in env.iteritems() %}
-{{ key }}="{{ value }}"
+{{ key }}={{ value }}
{%- endfor %}
{#-