From eb5eb2980a93bb917323e2a2eb018bfb14f11942 Mon Sep 17 00:00:00 2001
From: Michael Chow <machow@princeton.edu>
Date: Tue, 14 Apr 2020 14:12:22 -0400
Subject: [PATCH 1/2] fix: comment out nginx conf mount in docker-compose

---
 docker-compose.yml  | 4 ++--
 frontend/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e9c443a8..eba5b32d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       - "8080:80"
     depends_on:
       - app
-    volumes:
-      - ./frontend/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+#   volumes:
+#     - ./frontend/nginx.conf:/etc/nginx/conf.d/default.conf:ro
 volumes:
   data:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index fdf89f0d..88ec2880 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -4,4 +4,5 @@ COPY ./ /app
 RUN yarn && yarn build
 
 FROM nginx:alpine
-COPY --from=0 /app/dist /usr/share/nginx/html
\ No newline at end of file
+ADD ./nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=0 /app/dist /usr/share/nginx/html

From a114ca8745d2d5d9765f1c4ff4179b7fccfe4216 Mon Sep 17 00:00:00 2001
From: Michael Chow <machow@princeton.edu>
Date: Tue, 14 Apr 2020 15:51:13 -0400
Subject: [PATCH 2/2] fix: django ALLOW_HOSTS all, allows non localhost deploy

---
 core/settings/common.py | 2 +-
 docker-compose.yml      | 4 ++--
 frontend/nginx.conf     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/settings/common.py b/core/settings/common.py
index 3ed53783..1d111eab 100644
--- a/core/settings/common.py
+++ b/core/settings/common.py
@@ -25,7 +25,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']
 
 
 # Application definition
diff --git a/docker-compose.yml b/docker-compose.yml
index eba5b32d..df673c93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,8 @@ services:
       - data:/var/lib/postgresql/data/
   app:
     build: .
-    ports:
-      - "8000:8000"
+    expose:
+      - "8000"
     depends_on:
       - db
     environment:
diff --git a/frontend/nginx.conf b/frontend/nginx.conf
index 0ceafcfb..bb3ea6ba 100644
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -18,8 +18,8 @@ server {
         proxy_pass         http://docker-app;
         proxy_redirect     off;
         proxy_set_header   Host $host;
-        proxy_set_header   X-Real-IP $remote_addr;
-        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header   X-Forwarded-Host $server_name;
+        #proxy_set_header   X-Real-IP $remote_addr;
+        #proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        #proxy_set_header   X-Forwarded-Host $server_name;
     }
-}
\ No newline at end of file
+}