From 11148e0d19e95ac8e03de3a7a803049479f5386c Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Tue, 25 Aug 2020 04:53:56 -0500
Subject: [PATCH] =?UTF-8?q?build:=20=F0=9F=94=A8=20work=20on=20builds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.dev.yml                    | 17 +++++++++++++++
 docker-compose.override.yml               |  6 +++---
 docker-compose.prod.yml                   |  8 +++----
 docker-compose.yml                        | 10 ++++-----
 reverse-proxy/conf.d.dev/filterlists.conf | 26 +++++++++++++++++++++++
 reverse-proxy/conf.d/filterlists.conf     |  4 ++--
 6 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100644 docker-compose.dev.yml
 create mode 100644 reverse-proxy/conf.d.dev/filterlists.conf

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 000000000..7bad177e7
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,17 @@
+# overrides for local development (outside of Visual Studio)
+
+version: "3.8"
+
+services:
+  reverse_proxy:
+    image: nginx:alpine
+    ports:
+      - "80:80"
+    networks:
+      - reverse_proxy
+    depends_on:
+      - web
+      - directory.api
+    volumes:
+      - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
+      - ./reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index d8b3f04d6..eb3a623f4 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -3,11 +3,11 @@
 version: "3.8"
 
 services:
-  filterlists.directory.api:
+  directory.api:
     build:
       dockerfile: directory/src/FilterLists.Directory.Api/debug.Dockerfile
+    ports:
+      - "80"
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://+:80
-    ports:
-      - "80"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 5181f6561..e113f6193 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -3,20 +3,20 @@
 version: "3.8"
 
 services:
-  filterlists.reverse_proxy:
+  reverse_proxy:
     image: nginx:alpine
     ports:
       - "443:443"
     networks:
       - reverse_proxy
     depends_on:
-      - filterlists.web
-      - filterlists.directory.api
+      - web
+      - directory.api
     volumes:
       - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
       - ./reverse-proxy/conf.d:/etc/nginx/conf.d:ro
       - ~/cert:/etc/nginx/cert:ro
 
-  filterlists.web:
+  web:
     build:
       context: . # hack for https://github.com/docker/compose/issues/4047
diff --git a/docker-compose.yml b/docker-compose.yml
index 0db3c9fcb..2329e569a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,16 @@
 version: "3.8"
 
 services:
-  filterlists.web:
+  web:
     image: ${DOCKER_REGISTRY-}filterlists_web
     build:
       context: ./web
     networks:
       - reverse_proxy
     depends_on:
-      - filterlists.directory.api
+      - directory.api
 
-  filterlists.directory.api:
+  directory.api:
     image: ${DOCKER_REGISTRY-}filterlists_directory_api
     build:
       context: ./services
@@ -19,13 +19,13 @@ services:
       - reverse_proxy
       - directory
     depends_on:
-      - filterlists.directory.db
+      - directory.db
     volumes:
       - directory.db:/var/lib/postgresql/data
     environment:
       ConnectionStrings__DirectoryConnection: ${DIRECTORY_CONNECTION_STRING}
 
-  filterlists.directory.db:
+  directory.db:
     image: postgres:alpine
     networks:
       - directory
diff --git a/reverse-proxy/conf.d.dev/filterlists.conf b/reverse-proxy/conf.d.dev/filterlists.conf
new file mode 100644
index 000000000..51a01496b
--- /dev/null
+++ b/reverse-proxy/conf.d.dev/filterlists.conf
@@ -0,0 +1,26 @@
+server {
+  listen 80 default_server;
+
+  location ^~ /api {
+    rewrite ^/api/(.*)$ /$1 break;
+    proxy_pass         http://directory.api:80;
+    proxy_http_version 1.1;
+    proxy_set_header   Upgrade $http_upgrade;
+    proxy_set_header   Connection keep-alive;
+    proxy_set_header   Host $host;
+    proxy_cache_bypass $http_upgrade;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }
+
+  location / {
+    proxy_pass         http://web:80;
+    proxy_http_version 1.1;
+    proxy_set_header   Upgrade $http_upgrade;
+    proxy_set_header   Connection keep-alive;
+    proxy_set_header   Host $host;
+    proxy_cache_bypass $http_upgrade;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }
+} 
\ No newline at end of file
diff --git a/reverse-proxy/conf.d/filterlists.conf b/reverse-proxy/conf.d/filterlists.conf
index 879b06a67..bedf53029 100644
--- a/reverse-proxy/conf.d/filterlists.conf
+++ b/reverse-proxy/conf.d/filterlists.conf
@@ -11,7 +11,7 @@ server {
 
   location ^~ /api {
     rewrite ^/api/(.*)$ /$1 break;
-    proxy_pass         http://filterlists.directory.api:80;
+    proxy_pass         http://directory.api:80;
     proxy_http_version 1.1;
     proxy_set_header   Upgrade $http_upgrade;
     proxy_set_header   Connection keep-alive;
@@ -22,7 +22,7 @@ server {
   }
 
   location / {
-    proxy_pass         http://filterlists.web:80;
+    proxy_pass         http://web:80;
     proxy_http_version 1.1;
     proxy_set_header   Upgrade $http_upgrade;
     proxy_set_header   Connection keep-alive;