misc docker updates

docker-compose.override.yml

@@ -1,14 +0,0 @@
-version: '3.7'
-
-services:
-  filterlists.api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "80"
-
-  filterlists.web:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "80"

docker-compose.yml

@@ -1,29 +1,29 @@
 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
+    filterlists.mariadb:
+        image: mariadb
+    filterlists.nginx:
+        build:
+            context: ./nginx
+        ports:
+            - '80:80'
+            - '443:443'
+        links:
+            - filterlists.api
+            - filterlists.web
+    filterlists.api:
+        image: '${DOCKER_REGISTRY-}filterlistsapi'
+        build:
+            context: ./src
+            dockerfile: ./FilterLists.Api/Dockerfile
+        expose:
+            - '5000'
+        links:
+            - filterlists.mariadb
+    filterlists.web:
+        image: '${DOCKER_REGISTRY-}filterlistsweb'
+        build:
+            context: ./src
+            dockerfile: ./FilterLists.Web/Dockerfile
+        expose:
+            - '5001'

src/FilterLists.Api/Dockerfile

@@ -1,15 +1,15 @@
 FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
 WORKDIR /app
-EXPOSE 80
+EXPOSE 5000
 
 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/
-COPY src/FilterLists.Data/FilterLists.Data.csproj src/FilterLists.Data/
+COPY FilterLists.Api/FilterLists.Api.csproj src/FilterLists.Api/
+COPY FilterLists.Services/FilterLists.Services.csproj src/FilterLists.Services/
+COPY FilterLists.Data/FilterLists.Data.csproj src/FilterLists.Data/
 RUN dotnet restore src/FilterLists.Api/FilterLists.Api.csproj
 COPY . .
-WORKDIR /src/src/FilterLists.Api
+WORKDIR FilterLists.Api
 RUN dotnet build FilterLists.Api.csproj -c Release -o /app
 
 FROM build AS publish

src/FilterLists.Web/Dockerfile

@@ -1,13 +1,13 @@
 FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
 WORKDIR /app
-EXPOSE 80
+EXPOSE 5001
 
 FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /src
-COPY src/FilterLists.Web/FilterLists.Web.csproj src/FilterLists.Web/
+COPY FilterLists.Web/FilterLists.Web.csproj src/FilterLists.Web/
 RUN dotnet restore src/FilterLists.Web/FilterLists.Web.csproj
 COPY . .
-WORKDIR /src/src/FilterLists.Web
+WORKDIR FilterLists.Web
 RUN dotnet build FilterLists.Web.csproj -c Release -o /app
 
 FROM build AS publish