From cc6a7aa6d2dcab7a074b50b017be49d54d41eedd Mon Sep 17 00:00:00 2001
From: DTieman <djurre.tieman@gmail.com>
Date: Mon, 20 Mar 2023 16:58:48 +0100
Subject: [PATCH] another attempt that runs but is stuck in a loop?

---
 .gitignore                                    |  3 ++
 Deploymaunt/Dockerfile                        | 15 ---------
 Dockerfile                                    | 33 +++++++++++++++++++
 .../docker-compose.yml => docker-compose.yml  |  2 +-
 mau.json                                      |  1 -
 5 files changed, 37 insertions(+), 17 deletions(-)
 delete mode 100644 Deploymaunt/Dockerfile
 create mode 100644 Dockerfile
 rename Deploymaunt/docker-compose.yml => docker-compose.yml (92%)
 delete mode 100644 mau.json

diff --git a/.gitignore b/.gitignore
index 77c1c5f..d7d1dc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ bin
 obj
 Properties
 appsettings.Local.json
+.git
+*.DotSettings.user
+*.sln
\ No newline at end of file
diff --git a/Deploymaunt/Dockerfile b/Deploymaunt/Dockerfile
deleted file mode 100644
index 2edda92..0000000
--- a/Deploymaunt/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base
-WORKDIR /app
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
-COPY ../ /src/
-WORKDIR /src
-RUN dotnet build "MauMau-Server.csproj" -c Release -o out
-
-FROM build AS publish
-RUN dotnet publish "MauMau-Server.csproj" -c Release -o /app/publish
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "MauMau-Server.dll"]
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c5db9ca
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,33 @@
+#FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base
+#WORKDIR /app
+#
+#FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+#COPY ../ /src/
+#WORKDIR /src
+#RUN dotnet build "MauMau-Server.csproj" -c Release -o out
+#
+#FROM build AS publish
+#RUN dotnet publish "MauMau-Server.csproj" -c Release -o /app/publish
+#
+#FROM base AS final
+#WORKDIR /app
+#COPY --from=publish /app/publish .
+#ENTRYPOINT ["dotnet", "MauMau-Server.dll"]
+
+# https://hub.docker.com/_/microsoft-dotnet
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+WORKDIR /source
+
+# copy csproj and restore as distinct layers
+COPY *.csproj .
+RUN dotnet restore --use-current-runtime  
+
+# copy everything else and build app
+COPY . .
+RUN dotnet publish -c Release -o /out --use-current-runtime --self-contained false --no-restore
+
+# final stage/image
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
+COPY --from=build . .
+EXPOSE 5000
+CMD ["dotnet", "MauMau-Server.dll"]
\ No newline at end of file
diff --git a/Deploymaunt/docker-compose.yml b/docker-compose.yml
similarity index 92%
rename from Deploymaunt/docker-compose.yml
rename to docker-compose.yml
index 57d3f77..9dc5866 100644
--- a/Deploymaunt/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-      target: final
+      #target: final
     container_name: 'MauMau-server'
     restart: always
     networks:
diff --git a/mau.json b/mau.json
deleted file mode 100644
index 60c5d52..0000000
--- a/mau.json
+++ /dev/null
@@ -1 +0,0 @@
-{"CardType":"SPADES","CardValue":"THREE"}
\ No newline at end of file