From ad64b646b17dd1ad07c92af23c6012e283d7a4d7 Mon Sep 17 00:00:00 2001
From: Anna Sidwell <anna@takkaria.org>
Date: Sat, 24 Nov 2018 13:39:21 +0000
Subject: [PATCH] Make local.yml just run a postgres + mailhog instance

---
 local.env | 17 -----------------
 local.yml | 22 +++-------------------
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 local.env

diff --git a/local.env b/local.env
deleted file mode 100644
index 96ce936..0000000
--- a/local.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Django Configuration
-DEBUG=1
-ALLOWED_HOSTS=localhost
-DATABASE_HOST=db
-DATABASE_NAME=postgres
-DATABASE_PASSWORD=postgres
-EMAIL_HOST=mail
-EMAIL_HOST_USER=admin@ojuso.org
-EMAIL_HOST_PASSWORD=
-EMAIL_PORT=1025
-EMAIL_USE_TLS=0
-SECRET_KEY=kZQPK56roVhFkwPqFF9xZoHFlw38uVuXNCjtXor6FRiieiYds9ltuM6oZeZ75CEe
-SERVER_EMAIL=Ojuso Platform Notification <livvy@base.nu>
-
-# Postgres Database Setup
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=postgres
diff --git a/local.yml b/local.yml
index 989fc27..5bc0587 100644
--- a/local.yml
+++ b/local.yml
@@ -1,22 +1,5 @@
 version: '3'
 services:
-  map:
-    build: .
-    links:
-      - db:db
-      - mailhog:mail
-    volumes:
-      - .containers/map/static:/app/static
-      - .containers/map/gunicorn.sock:/app/gunicorn.sock
-      - ./apps:/app/apps
-      - ./ojusomap:/app/ojusomap
-      - ./support:/app/support
-    ports:
-      - 8000:8000
-    env_file:
-      - ./local.env
-    command: /bin/sh -c "python3 manage.py runserver 0.0.0.0:8000"
-
   db:
     image: mdillon/postgis:9.6-alpine
     volumes:
@@ -24,8 +7,9 @@ services:
       - ./support/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
     ports:
       - 5432:5432
-    env_file:
-      - ./local.env
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
 
   mailhog:
     image: mailhog/mailhog