From 8f153fd2b920ff9e5b4430729bd548db70a1a435 Mon Sep 17 00:00:00 2001 From: DTieman Date: Mon, 20 Mar 2023 19:13:33 +0100 Subject: [PATCH] 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 @@ net7.0 enable enable - MauMau_Server - MauMau_Server - out\ 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