From 8f45bb878a4493e7d848ff5395d5ab20bc82b0c4 Mon Sep 17 00:00:00 2001
From: Lee Holmes <github@leeholmes.com>
Date: Thu, 8 Sep 2022 17:12:01 -0700
Subject: [PATCH] Updates to support docker compose and .NET 6.0

---
 docker-compose.yml                |  6 ++----
 nginx/Dockerfile                  |  4 ++--
 nginx/nginx.conf                  |  2 +-
 src/AlbumViewerNetCore/Dockerfile | 10 +++++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1797ca53..316bd8c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,8 +10,8 @@ services:
     container_name: nginxalbumviewer
     image: nginxalbumviewer
     build:
-      context: ./nginx
-      dockerfile: Dockerfile
+      context: ./
+      dockerfile: nginx/Dockerfile
     # volumes:.
     #   - ./dist:/usr/share/nginx/html
     ports:
@@ -28,8 +28,6 @@ services:
       dockerfile: Dockerfile
  #   volumes:
  #     - ./src/AlbumViewerNetCore:/var/www/albumviewer
-    ports:
-     - "5000:5000"
     networks:
       - app-network
  
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index b25067ed..41b8bf3a 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -3,8 +3,8 @@ FROM nginx:alpine
 MAINTAINER Rick Strahl
 
 # Copy custom nginx config
-COPY ./nginx.conf /etc/nginx/nginx.conf
-COPY ./wwwroot /usr/share/nginx/html
+COPY nginx/nginx.conf /etc/nginx/nginx.conf
+COPY src/AlbumViewerNetCore/wwwroot /usr/share/nginx/html
 
 EXPOSE 80 443
 
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 72b54e70..8468b52f 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -54,6 +54,6 @@ http {
          
     upstream dotnet {
         zone dotnet 64k;
-        server 127.0.0.1:5000;
+        server westwindalbumviewer:5000;
     }
 }
\ No newline at end of file
diff --git a/src/AlbumViewerNetCore/Dockerfile b/src/AlbumViewerNetCore/Dockerfile
index 09298502..aa21257f 100644
--- a/src/AlbumViewerNetCore/Dockerfile
+++ b/src/AlbumViewerNetCore/Dockerfile
@@ -1,17 +1,17 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
+FROM mcr.microsoft.com/dotnet/aspnet:latest
 
 MAINTAINER Rick Strahl
 
-ENV ASPNETCORE_URLS=http://*:80
+ENV ASPNETCORE_URLS=http://*:5000
 ENV ASPNETCORE_ENVIRONMENT=Production
 
 # Allow 1433 for SQL Server Access
-EXPOSE 1433
+#EXPOSE 1433
 
 WORKDIR /var/www/albumviewer
 
 # copy publish folder contents to web root
-COPY ./bin/Release/netcoreapp3.1/publish .
+COPY ./bin/Release/net6.0/publish .
 
 # Run out of Publish Folder
-CMD ["/bin/sh", "-c", "dotnet 'AlbumViewerNetCore.dll'"]
+CMD ["/bin/sh", "-c", "dotnet 'AlbumViewerNetCore.dll'"]
\ No newline at end of file