Migrate to docker #641 - Update to 3.1, Use aspnet container for runt…

…ime.

.dockerignore

@@ -1,6 +1,7 @@
 .git/
 .github/
 .idea/
+.vs/
 docs/
 **/bin/
 **/obj/

Dockerfile

@@ -1,22 +1,26 @@
 FROM node:latest as build-node
 
-WORKDIR /tmp
-COPY ./IsraelHiking.Web/package.json ./IsraelHiking.Web/package-lock.json ./
+WORKDIR /angular
+COPY ./IsraelHiking.Web/ ./
 
-RUN npm i 
+RUN npm i && npm run build -- --no-progress
 
-COPY /IsraelHiking.Web/ ./
-RUN npm run build -- --no-progress
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as build-net
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0 as release
-
-WORKDIR /usr/app
+WORKDIR /net
 COPY . .
 
 RUN dotnet restore && dotnet build
 
-COPY --from=build-node /tmp/wwwroot ./IsraelHiking.Web/wwwroot
+WORKDIR /net/IsraelHiking.Web
+
+RUN dotnet publish
+
+From mcr.microsoft.com/dotnet/core/aspnet:3.1 as release
+
+WORKDIR /israelhiking
 
-WORKDIR /usr/app/IsraelHiking.Web
+COPY --from=build-net /net/IsraelHiking.Web/bin/Debug/netcoreapp3.1/publish ./
+COPY --from=build-node /angular/wwwroot ./wwwroot
 
-CMD dotnet run --no-build --no-restore
+ENTRYPOINT ["dotnet", "IsraelHiking.Web.dll"]

IsraelHiking.Web/Startup.cs

@@ -128,11 +128,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             var rewriteOptions = new RewriteOptions();
             rewriteOptions.Rules.Add(new RewriteWithQueryRule(".*_escaped_fragment_=%2F%3Fs%3D(.*)", "api/opengraph/$1", false));
 
-            if (env.IsDevelopment())
+            if (_isDevelopment)
             {
                 app.UseDeveloperExceptionPage();
             }
-            rewriteOptions.AddRedirectToHttps();
+            else
+            {
+                rewriteOptions.AddRedirectToHttps();
+            }
             app.UseRewriter(rewriteOptions);
 
             app.UseCors(builder =>

IsraelHiking.Web/appsettings.Docker.json

@@ -0,0 +1,3 @@
+{
+	"binariesFolder": ""
+}

docker-compose.yml

@@ -1,13 +1,15 @@
 version: '3.4'
 
 services:
-  #website:
-  #  image: israel-hiking
-  #  build: .
-  #  environment:
-  #    - ASPNETCORE_ENVIRONMENT=Development
-  #  ports:
-  #    - "5000:5000"
+  website:
+    image: israel-hiking
+    build: .
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "5000:5000"
+    volumes:
+      - ./IsraelHiking.Web/appsettings.Docker.json:/israelhiking/appsettings.json
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:5.6.16
     container_name: elasticsearch