diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1696544..8c58139 100644 --- a/.github/workflows/main.yml +++ b/.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 \ No newline at end of file + 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 + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d0e1df6..d6a0c1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base WORKDIR /app -EXPOSE 80 -EXPOSE 443 +EXPOSE 5000 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build WORKDIR /src diff --git a/docker-compose.yml b/docker-compose.yml index 85e360b..279407b 100644 --- a/docker-compose.yml +++ b/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 \ No newline at end of file