add nginx, other docker tweaks

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"
-

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
-

nginx/Dockerfile

@@ -0,0 +1,2 @@
+FROM nginx
+COPY nginx.conf /etc/nginx/nginx.conf

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;
+        }
+    }
+}

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/

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