From 4769c8b5e3ba70301b1123c5750429b2092b01b1 Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Sat, 28 Sep 2019 06:20:07 +1000
Subject: Create custom manage.py entry point, remove scripts and merge
 Dockerfile.

---
 docker-compose.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 4ea110c4..71a5593f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,8 +22,8 @@ services:
   web:
     build:
       context: .
-      dockerfile: docker/app/local.Dockerfile
-    command: docker/app/scripts/migrate_and_serve.sh
+      dockerfile: docker/Dockerfile
+    command: ["run", "--debug"]
     ports:
       - "127.0.0.1:8000:8000"
     depends_on:
@@ -33,7 +33,6 @@ services:
       - staticfiles:/var/www/static
     environment:
       DATABASE_URL: postgres://pysite:pysite@postgres:5432/pysite
-      DEBUG: "true"
       SECRET_KEY: suitable-for-development-only
       STATIC_ROOT: /var/www/static
 
-- 
cgit v1.2.3


From 7f8468ecdb2bc2820755e9b4bf9f213f1e8d0908 Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Sat, 28 Sep 2019 22:40:14 +1000
Subject: Support internal docker network DNS resolution & dev ALLOWED_HOSTS
 env var.

---
 docker-compose.yml     |  6 ++++++
 pydis_site/settings.py | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 71a5593f..3a2e5398 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,12 @@ services:
       context: .
       dockerfile: docker/Dockerfile
     command: ["run", "--debug"]
+    networks:
+      default:
+        aliases:
+          - api.web
+          - admin.web
+          - staff.web
     ports:
       - "127.0.0.1:8000:8000"
     depends_on:
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 3f6cd94a..4534f54b 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -30,12 +30,19 @@ DEBUG = env('DEBUG')
 
 # SECURITY WARNING: keep the secret key used in production secret!
 if DEBUG:
-    ALLOWED_HOSTS = [
-        'pythondiscord.local',
-        'admin.pythondiscord.local',
-        'api.pythondiscord.local',
-        'staff.pythondiscord.local',
-    ]
+    ALLOWED_HOSTS = env.list(
+        'ALLOWED_HOSTS',
+        default=[
+            'pythondiscord.local',
+            'api.pythondiscord.local',
+            'admin.pythondiscord.local',
+            'staff.pythondiscord.local',
+            'web',
+            'api.web',
+            'admin.web',
+            'staff.web'
+        ]
+    )
     SECRET_KEY = secrets.token_urlsafe(32)
 
 elif 'CI' in os.environ:
-- 
cgit v1.2.3