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/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() diff --git a/Deploymaunt/docker-compose.yml b/Deploymaunt/docker-compose.yml deleted file mode 100644 index 57d3f77..0000000 --- a/Deploymaunt/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3.9' -services: - server: - build: - context: . - dockerfile: Dockerfile - target: final - container_name: 'MauMau-server' - restart: always - networks: - - maumau -networks: - maumau: - # hier later extern naar client - driver: bridge \ No newline at end of file diff --git a/Deploymaunt/Dockerfile b/Dockerfile similarity index 53% rename from Deploymaunt/Dockerfile rename to Dockerfile index 2edda92..d0e1df6 100644 --- a/Deploymaunt/Dockerfile +++ b/Dockerfile @@ -1,10 +1,15 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base WORKDIR /app +EXPOSE 80 +EXPOSE 443 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build -COPY ../ /src/ WORKDIR /src -RUN dotnet build "MauMau-Server.csproj" -c Release -o out +COPY ["MauMau-Server.csproj", "./"] +RUN dotnet restore "MauMau-Server.csproj" +COPY . . +WORKDIR "/src" +RUN dotnet build "MauMau-Server.csproj" -c Release -o /app/build FROM build AS publish RUN dotnet publish "MauMau-Server.csproj" -c Release -o /app/publish diff --git a/MauMau-Server.csproj b/MauMau-Server.csproj index 5ad5ad4..476e59d 100644 --- a/MauMau-Server.csproj +++ b/MauMau-Server.csproj @@ -4,9 +4,6 @@ net7.0 enable enable - MauMau_Server - MauMau_Server - out\ diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..85e360b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,17 @@ +version: '3.9' +services: + server: + build: + context: . + dockerfile: Dockerfile + #target: final + container_name: 'MauMau-Server' + restart: always + ports: + - "80:80" + networks: + - MauMau +networks: + MauMau: + # hier later extern naar client + driver: bridge \ No newline at end of file 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