From 79657e2eb8f8cd020eeebd834bc925e7a4bd66ba Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 12 Jan 2019 18:10:17 -0600
Subject: [PATCH] add nginx, other docker tweaks

---
 docker-compose.override.yml    |  3 +--
 docker-compose.yml             | 18 ++++++++++++++++--
 nginx/Dockerfile               |  2 ++
 nginx/nginx.conf               | 24 ++++++++++++++++++++++++
 src/FilterLists.Api/Dockerfile |  4 ++--
 src/FilterLists.Web/Dockerfile |  4 ++--
 6 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 nginx/Dockerfile
 create mode 100644 nginx/nginx.conf

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index fc499ec89..e179c67ed 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.7'
 
 services:
   filterlists.api:
@@ -12,4 +12,3 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
     ports:
       - "80"
-
diff --git a/docker-compose.yml b/docker-compose.yml
index ad1677ccb..20e9ffdc9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,29 @@
-version: '3.4'
+version: '3.7'
 
 services:
+  filterlists.mariadb:
+    image: mariadb
+
+  filterlists.nginx:
+    build:
+      context:  ./nginx
+      dockerfile: nginx/Dockerfile
+    ports:
+      - "80:80"
+    links:
+      - filterlists.api
+      - filterlists.web
+
   filterlists.api:
     image: ${DOCKER_REGISTRY-}filterlistsapi
     build:
       context: .
       dockerfile: src/FilterLists.Api/Dockerfile
+    links:
+      - filterlists.mariadb
 
   filterlists.web:
     image: ${DOCKER_REGISTRY-}filterlistsweb
     build:
       context: .
       dockerfile: src/FilterLists.Web/Dockerfile
-
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
new file mode 100644
index 000000000..0d947da02
--- /dev/null
+++ b/nginx/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx
+COPY nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
new file mode 100644
index 000000000..5bcf81002
--- /dev/null
+++ b/nginx/nginx.conf
@@ -0,0 +1,24 @@
+worker_processes 4;
+ 
+events { worker_connections 1024; }
+ 
+http {
+    sendfile on;
+ 
+    upstream app_servers {
+        server app:5000;
+    }
+ 
+    server {
+        listen 80;
+ 
+        location / {
+            proxy_pass         http://app_servers;
+            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;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Api/Dockerfile b/src/FilterLists.Api/Dockerfile
index 34c127cfc..7d221b794 100644
--- a/src/FilterLists.Api/Dockerfile
+++ b/src/FilterLists.Api/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1-sdk AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /src
 COPY src/FilterLists.Api/FilterLists.Api.csproj src/FilterLists.Api/
 COPY src/FilterLists.Services/FilterLists.Services.csproj src/FilterLists.Services/
diff --git a/src/FilterLists.Web/Dockerfile b/src/FilterLists.Web/Dockerfile
index 23a45c8ff..e9b666108 100644
--- a/src/FilterLists.Web/Dockerfile
+++ b/src/FilterLists.Web/Dockerfile
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM microsoft/dotnet:2.1-sdk AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /src
 COPY src/FilterLists.Web/FilterLists.Web.csproj src/FilterLists.Web/
 RUN dotnet restore src/FilterLists.Web/FilterLists.Web.csproj