From 966d8bd79e8a309ade200516579bc18cf5b3de19 Mon Sep 17 00:00:00 2001
From: kunkliricsi <kunkli.ricsi@gmail.com>
Date: Mon, 23 Nov 2020 13:31:09 +0100
Subject: [PATCH] Some changes

---
 .dockerignore               |  1 +
 Birdmap.API/Dockerfile      | 14 ++++++--------
 docker-compose.dcproj       |  3 ---
 docker-compose.override.yml | 13 -------------
 docker-compose.yml          | 13 ++++++++++---
 5 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 docker-compose.override.yml

diff --git a/.dockerignore b/.dockerignore
index 6fa523a..80879a4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -12,6 +12,7 @@
 **/*.dbmdl
 **/*.jfm
 **/azds.yaml
+**/docs
 **/bin
 **/docker-compose*
 **/Dockerfile*
diff --git a/Birdmap.API/Dockerfile b/Birdmap.API/Dockerfile
index 5782a3c..b40d371 100644
--- a/Birdmap.API/Dockerfile
+++ b/Birdmap.API/Dockerfile
@@ -1,15 +1,13 @@
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
 WORKDIR /app
-EXPOSE 80
-EXPOSE 443
+RUN apt-get update && apt-get install -y curl
 RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
-RUN apt-get update
-RUN apt-get install -y nodejs
+RUN apt-get update && apt-get install -y nodejs
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
+RUN apt-get update && apt-get install -y curl
 RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
-RUN apt-get update
-RUN apt-get install -y nodejs
+RUN apt-get update && apt-get install -y nodejs
 WORKDIR /src
 COPY ["Birdmap.API/Birdmap.API.csproj", "Birdmap.API/"]
 COPY ["Birdmap.BLL/Birdmap.BLL.csproj", "Birdmap.BLL/"]
diff --git a/docker-compose.dcproj b/docker-compose.dcproj
index 1b62b56..4743b4e 100644
--- a/docker-compose.dcproj
+++ b/docker-compose.dcproj
@@ -9,9 +9,6 @@
     <DockerServiceName>birdmap.api</DockerServiceName>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="docker-compose.override.yml">
-      <DependentUpon>docker-compose.yml</DependentUpon>
-    </None>
     <None Include="docker-compose.yml" />
     <None Include=".dockerignore" />
   </ItemGroup>
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
deleted file mode 100644
index b7c4c25..0000000
--- a/docker-compose.override.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: '3.4'
-
-services:
-  birdmap.api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=https://+:443;http://+:80
-    ports:
-      - "80"
-      - "443"
-    volumes:
-      - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
-      - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index cdf26ce..ccef4ac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,15 +10,22 @@ services:
     birdmap.api:
         image: ${DOCKER_REGISTRY-}birdmapapi
         ports:
-            - "5000:5000"
-            - "5001:5001"
+            - "8000:80"
+            - "8001:443"
+        volumes:
+            - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
+            - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro
         build:
           context: .
           dockerfile: Birdmap.API/Dockerfile
         depends_on:
             - db
         environment:
-            - ASPNETCORE_URLS=https://localhost:5001;http://localhost:5000
+            - ASPNETCORE_ENVIRONMENT=Development
+            - ASPNETCORE_URLS=https://+;http://+
+            - ASPNETCORE_HTTPS_PORT=8001
+            - ASPNETCORE_Kestrel__Certificates__Default__Password=certpass123
+            - ASPNETCORE_Kestrel__Certificates__Default__Path=/root/.aspnet/https/aspnetapp.pfx
             - Birdmap_LocalDbConnectionString=Data Source=db;Initial Catalog=birdmap;User=sa;Password=RPSsql12345
             - Birdmap_Defaults__Users__0__Name=admin
             - Birdmap_Defaults__Users__0__Password=pass