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 1/6] 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

From 8f153fd2b920ff9e5b4430729bd548db70a1a435 Mon Sep 17 00:00:00 2001
From: DTieman <djurre.tieman@gmail.com>
Date: Mon, 20 Mar 2023 19:13:33 +0100
Subject: [PATCH 2/6] idk why it works now, help

---
 Dockerfile                                    | 45 +++++++------------
 .../Controllers}/MauController.cs             |  0
 .../Controllers}/RoomController.cs            |  0
 {Mau => MauMau-Server/Mau}/Card.cs            |  0
 {Mau => MauMau-Server/Mau}/CardDTO.cs         |  0
 {Mau => MauMau-Server/Mau}/Deck.cs            |  0
 {Mau => MauMau-Server/Mau}/Game.cs            |  0
 {Mau => MauMau-Server/Mau}/GameState.cs       |  0
 {Mau => MauMau-Server/Mau}/Player.cs          |  0
 .../MauMau-Server.csproj                      |  3 --
 Program.cs => MauMau-Server/Program.cs        |  0
 .../Websockets}/Room.cs                       |  0
 .../Websockets}/RoomManager.cs                |  0
 .../appsettings.Development.json              |  0
 .../appsettings.json                          |  0
 15 files changed, 16 insertions(+), 32 deletions(-)
 rename {Controllers => MauMau-Server/Controllers}/MauController.cs (100%)
 rename {Controllers => MauMau-Server/Controllers}/RoomController.cs (100%)
 rename {Mau => MauMau-Server/Mau}/Card.cs (100%)
 rename {Mau => MauMau-Server/Mau}/CardDTO.cs (100%)
 rename {Mau => MauMau-Server/Mau}/Deck.cs (100%)
 rename {Mau => MauMau-Server/Mau}/Game.cs (100%)
 rename {Mau => MauMau-Server/Mau}/GameState.cs (100%)
 rename {Mau => MauMau-Server/Mau}/Player.cs (100%)
 rename MauMau-Server.csproj => MauMau-Server/MauMau-Server.csproj (78%)
 rename Program.cs => MauMau-Server/Program.cs (100%)
 rename {Websockets => MauMau-Server/Websockets}/Room.cs (100%)
 rename {Websockets => MauMau-Server/Websockets}/RoomManager.cs (100%)
 rename appsettings.Development.json => MauMau-Server/appsettings.Development.json (100%)
 rename appsettings.json => MauMau-Server/appsettings.json (100%)

diff --git a/Dockerfile b/Dockerfile
index c5db9ca..2f1609f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,33 +1,20 @@
-#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"]
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
 
-# 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
+WORKDIR /src
+COPY ["MauMau-Server/MauMau-Server.csproj", "MauMau-Server/"]
+RUN dotnet restore "MauMau-Server/MauMau-Server.csproj"
 COPY . .
-RUN dotnet publish -c Release -o /out --use-current-runtime --self-contained false --no-restore
+WORKDIR "/src/MauMau-Server"
+RUN dotnet build "MauMau-Server.csproj" -c Release -o /app/build
 
-# 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
+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/Controllers/MauController.cs b/MauMau-Server/Controllers/MauController.cs
similarity index 100%
rename from Controllers/MauController.cs
rename to MauMau-Server/Controllers/MauController.cs
diff --git a/Controllers/RoomController.cs b/MauMau-Server/Controllers/RoomController.cs
similarity index 100%
rename from Controllers/RoomController.cs
rename to MauMau-Server/Controllers/RoomController.cs
diff --git a/Mau/Card.cs b/MauMau-Server/Mau/Card.cs
similarity index 100%
rename from Mau/Card.cs
rename to MauMau-Server/Mau/Card.cs
diff --git a/Mau/CardDTO.cs b/MauMau-Server/Mau/CardDTO.cs
similarity index 100%
rename from Mau/CardDTO.cs
rename to MauMau-Server/Mau/CardDTO.cs
diff --git a/Mau/Deck.cs b/MauMau-Server/Mau/Deck.cs
similarity index 100%
rename from Mau/Deck.cs
rename to MauMau-Server/Mau/Deck.cs
diff --git a/Mau/Game.cs b/MauMau-Server/Mau/Game.cs
similarity index 100%
rename from Mau/Game.cs
rename to MauMau-Server/Mau/Game.cs
diff --git a/Mau/GameState.cs b/MauMau-Server/Mau/GameState.cs
similarity index 100%
rename from Mau/GameState.cs
rename to MauMau-Server/Mau/GameState.cs
diff --git a/Mau/Player.cs b/MauMau-Server/Mau/Player.cs
similarity index 100%
rename from Mau/Player.cs
rename to MauMau-Server/Mau/Player.cs
diff --git a/MauMau-Server.csproj b/MauMau-Server/MauMau-Server.csproj
similarity index 78%
rename from MauMau-Server.csproj
rename to MauMau-Server/MauMau-Server.csproj
index 5ad5ad4..476e59d 100644
--- a/MauMau-Server.csproj
+++ b/MauMau-Server/MauMau-Server.csproj
@@ -4,9 +4,6 @@
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <RootNamespace>MauMau_Server</RootNamespace>
-    <AssemblyName>MauMau_Server</AssemblyName>
-    <OutputPath>out\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Program.cs b/MauMau-Server/Program.cs
similarity index 100%
rename from Program.cs
rename to MauMau-Server/Program.cs
diff --git a/Websockets/Room.cs b/MauMau-Server/Websockets/Room.cs
similarity index 100%
rename from Websockets/Room.cs
rename to MauMau-Server/Websockets/Room.cs
diff --git a/Websockets/RoomManager.cs b/MauMau-Server/Websockets/RoomManager.cs
similarity index 100%
rename from Websockets/RoomManager.cs
rename to MauMau-Server/Websockets/RoomManager.cs
diff --git a/appsettings.Development.json b/MauMau-Server/appsettings.Development.json
similarity index 100%
rename from appsettings.Development.json
rename to MauMau-Server/appsettings.Development.json
diff --git a/appsettings.json b/MauMau-Server/appsettings.json
similarity index 100%
rename from appsettings.json
rename to MauMau-Server/appsettings.json

From b7483d56a9bb99b2f4a8e291723a63eb3eb27ea2 Mon Sep 17 00:00:00 2001
From: DTieman <djurre.tieman@gmail.com>
Date: Mon, 20 Mar 2023 19:44:39 +0100
Subject: [PATCH 3/6] MauMau

---
 docker-compose.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9dc5866..29419f7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,11 +5,11 @@ services:
       context: .
       dockerfile: Dockerfile
       #target: final
-    container_name: 'MauMau-server'
+    container_name: 'MauMau-Server'
     restart: always
     networks:
-      - maumau
+      - MauMau
 networks:
-    maumau:
-        # hier later extern naar client
-        driver: bridge
\ No newline at end of file
+  MauMau:
+    # hier later extern naar client
+    driver: bridge
\ No newline at end of file

From 1e4b69f83ae62e116046ade3ad9945921c9f9d5f Mon Sep 17 00:00:00 2001
From: DTieman <djurre.tieman@gmail.com>
Date: Tue, 21 Mar 2023 09:41:48 +0100
Subject: [PATCH 4/6] restructure

---
 {MauMau-Server/Controllers => Controllers}/MauController.cs | 0
 .../Controllers => Controllers}/RoomController.cs           | 0
 Dockerfile                                                  | 6 +++---
 {MauMau-Server/Mau => Mau}/Card.cs                          | 0
 {MauMau-Server/Mau => Mau}/CardDTO.cs                       | 0
 {MauMau-Server/Mau => Mau}/Deck.cs                          | 0
 {MauMau-Server/Mau => Mau}/Game.cs                          | 0
 {MauMau-Server/Mau => Mau}/GameState.cs                     | 0
 {MauMau-Server/Mau => Mau}/Player.cs                        | 0
 MauMau-Server/MauMau-Server.csproj => MauMau-Server.csproj  | 0
 MauMau-Server/Program.cs => Program.cs                      | 0
 {MauMau-Server/Websockets => Websockets}/Room.cs            | 0
 {MauMau-Server/Websockets => Websockets}/RoomManager.cs     | 0
 ...ettings.Development.json => appsettings.Development.json | 0
 MauMau-Server/appsettings.json => appsettings.json          | 0
 15 files changed, 3 insertions(+), 3 deletions(-)
 rename {MauMau-Server/Controllers => Controllers}/MauController.cs (100%)
 rename {MauMau-Server/Controllers => Controllers}/RoomController.cs (100%)
 rename {MauMau-Server/Mau => Mau}/Card.cs (100%)
 rename {MauMau-Server/Mau => Mau}/CardDTO.cs (100%)
 rename {MauMau-Server/Mau => Mau}/Deck.cs (100%)
 rename {MauMau-Server/Mau => Mau}/Game.cs (100%)
 rename {MauMau-Server/Mau => Mau}/GameState.cs (100%)
 rename {MauMau-Server/Mau => Mau}/Player.cs (100%)
 rename MauMau-Server/MauMau-Server.csproj => MauMau-Server.csproj (100%)
 rename MauMau-Server/Program.cs => Program.cs (100%)
 rename {MauMau-Server/Websockets => Websockets}/Room.cs (100%)
 rename {MauMau-Server/Websockets => Websockets}/RoomManager.cs (100%)
 rename MauMau-Server/appsettings.Development.json => appsettings.Development.json (100%)
 rename MauMau-Server/appsettings.json => appsettings.json (100%)

diff --git a/MauMau-Server/Controllers/MauController.cs b/Controllers/MauController.cs
similarity index 100%
rename from MauMau-Server/Controllers/MauController.cs
rename to Controllers/MauController.cs
diff --git a/MauMau-Server/Controllers/RoomController.cs b/Controllers/RoomController.cs
similarity index 100%
rename from MauMau-Server/Controllers/RoomController.cs
rename to Controllers/RoomController.cs
diff --git a/Dockerfile b/Dockerfile
index 2f1609f..d0e1df6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@ EXPOSE 443
 
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
-COPY ["MauMau-Server/MauMau-Server.csproj", "MauMau-Server/"]
-RUN dotnet restore "MauMau-Server/MauMau-Server.csproj"
+COPY ["MauMau-Server.csproj", "./"]
+RUN dotnet restore "MauMau-Server.csproj"
 COPY . .
-WORKDIR "/src/MauMau-Server"
+WORKDIR "/src"
 RUN dotnet build "MauMau-Server.csproj" -c Release -o /app/build
 
 FROM build AS publish
diff --git a/MauMau-Server/Mau/Card.cs b/Mau/Card.cs
similarity index 100%
rename from MauMau-Server/Mau/Card.cs
rename to Mau/Card.cs
diff --git a/MauMau-Server/Mau/CardDTO.cs b/Mau/CardDTO.cs
similarity index 100%
rename from MauMau-Server/Mau/CardDTO.cs
rename to Mau/CardDTO.cs
diff --git a/MauMau-Server/Mau/Deck.cs b/Mau/Deck.cs
similarity index 100%
rename from MauMau-Server/Mau/Deck.cs
rename to Mau/Deck.cs
diff --git a/MauMau-Server/Mau/Game.cs b/Mau/Game.cs
similarity index 100%
rename from MauMau-Server/Mau/Game.cs
rename to Mau/Game.cs
diff --git a/MauMau-Server/Mau/GameState.cs b/Mau/GameState.cs
similarity index 100%
rename from MauMau-Server/Mau/GameState.cs
rename to Mau/GameState.cs
diff --git a/MauMau-Server/Mau/Player.cs b/Mau/Player.cs
similarity index 100%
rename from MauMau-Server/Mau/Player.cs
rename to Mau/Player.cs
diff --git a/MauMau-Server/MauMau-Server.csproj b/MauMau-Server.csproj
similarity index 100%
rename from MauMau-Server/MauMau-Server.csproj
rename to MauMau-Server.csproj
diff --git a/MauMau-Server/Program.cs b/Program.cs
similarity index 100%
rename from MauMau-Server/Program.cs
rename to Program.cs
diff --git a/MauMau-Server/Websockets/Room.cs b/Websockets/Room.cs
similarity index 100%
rename from MauMau-Server/Websockets/Room.cs
rename to Websockets/Room.cs
diff --git a/MauMau-Server/Websockets/RoomManager.cs b/Websockets/RoomManager.cs
similarity index 100%
rename from MauMau-Server/Websockets/RoomManager.cs
rename to Websockets/RoomManager.cs
diff --git a/MauMau-Server/appsettings.Development.json b/appsettings.Development.json
similarity index 100%
rename from MauMau-Server/appsettings.Development.json
rename to appsettings.Development.json
diff --git a/MauMau-Server/appsettings.json b/appsettings.json
similarity index 100%
rename from MauMau-Server/appsettings.json
rename to appsettings.json

From 6282e6bf27e071d0232e3a78f75c3ad9a8712305 Mon Sep 17 00:00:00 2001
From: DTieman <djurre.tieman@gmail.com>
Date: Tue, 21 Mar 2023 09:49:12 +0100
Subject: [PATCH 5/6] tested if it still works locally

---
 Controllers/MauController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Controllers/MauController.cs b/Controllers/MauController.cs
index acfc789..7f713e0 100644
--- a/Controllers/MauController.cs
+++ b/Controllers/MauController.cs
@@ -5,7 +5,7 @@ namespace MauMau_Server.Controllers;
 
 [ApiController]
 [Route("[controller]")]
-public class DeckController : ControllerBase
+public class MauController : ControllerBase
 {
     [HttpGet("deck")]
     public IActionResult GetDeck()

From 1923e5a3eda11fca61db03945e1e52fe09cfe0b3 Mon Sep 17 00:00:00 2001
From: Jordan Geurtsen <j.geurtsen1@student.han.nl>
Date: Wed, 22 Mar 2023 10:07:56 +0100
Subject: [PATCH 6/6] fixed docker

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 29419f7..85e360b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,8 @@ services:
       #target: final
     container_name: 'MauMau-Server'
     restart: always
+    ports:
+      - "80:80"
     networks:
       - MauMau
 networks: