From d7f0488ddfd0e1b16e57bdf54c58a8ba66fd9d68 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Thu, 24 Aug 2017 19:25:03 +0300
Subject: [PATCH] Reference the newly created .envs/**/.* files in local.yml

---
 {{cookiecutter.project_slug}}/local.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 94562b9c5..a2171e403 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -14,9 +14,9 @@ services:
       - mailhog{% endif %}
     volumes:
       - .:/app
-    environment:
-      - POSTGRES_USER={{cookiecutter.project_slug}}
-      - USE_DOCKER=yes
+    env_file:
+      - ./.envs/.local/.django
+      - ./.envs/.local/.postgres
     ports:
       - "8000:8000"
     command: /start-dev.sh
@@ -26,8 +26,8 @@ services:
     volumes:
       - postgres_data_dev:/var/lib/postgresql/data
       - postgres_backup_dev:/backups
-    environment:
-      - POSTGRES_USER={{cookiecutter.project_slug}}
+    env_file:
+      - ./.envs/.local/.postgres
 {% if cookiecutter.use_pycharm == 'y' %}
   pycharm:
     build:
@@ -35,10 +35,11 @@ services:
       dockerfile: ./compose/django/Dockerfile-dev
     depends_on:
       - postgres
-    environment:
-      - POSTGRES_USER={{cookiecutter.project_slug}}
     volumes:
       - .:/app
+    env_file:
+      - ./.env/.local/.django
+      - ./.env/.local/.postgres
 {% endif %}
 {% if cookiecutter.use_mailhog == 'y' %}
   mailhog: