Merge remote-tracking branch 'origin/developmaunt' into developmaunt

.github/workflows/main.yml

@@ -1,20 +1,18 @@
-name: Build & Test
+name: Build Mau & Deploy Mau
 
 on:
   push:
     branches:
       - mauster
-      - developmaunt
   pull_request:
     branches:
       - mauster
-      - developmaunt
   workflow_dispatch:
 
 concurrency:
   group: mau
   cancel-in-progress: true
-  
+
 env:
   DOTNET_INSTALL_DIR: "./.dotnet"
 
@@ -35,4 +33,15 @@ jobs:
       - name: Build
         run: dotnet build --configuration Release --no-restore
       - name: Test
-        run: dotnet test --no-restore --verbosity normal
+        run: dotnet test --no-restore --verbosity normal
+  deploy:
+    runs-on: self-hosted
+    needs: build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+      - name: Docker Compose
+        run: docker compose up -d --build
+      

Dockerfile

@@ -1,7 +1,6 @@
 FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
-EXPOSE 80
+EXPOSE 5000
-EXPOSE 443
 
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src

docker-compose.yml

@@ -4,14 +4,12 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-      #target: final
     container_name: 'MauMau-Server'
     restart: always
     ports:
-      - "80:80"
+      - "5000:5000"
     networks:
       - MauMau
 networks:
   MauMau:
-    # hier later extern naar client
     driver: bridge