From 2e24fa706c4e7ba0b95a985e5c40385c61f7d180 Mon Sep 17 00:00:00 2001 From: Jordan Geurtsen Date: Thu, 23 Mar 2023 21:15:53 +0100 Subject: [PATCH] workflow shizzle --- .github/workflows/main.yml | 14 +++++++++----- docker-compose.yml | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1696544..44f8694 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,20 +1,18 @@ -name: Build & Test +name: El Tigre - MauMau Server 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,10 @@ 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 + - name: Build and push Docker images + uses: docker/build-push-action@v4.0.0 + with: + context: ../../ + file: Dockerfile + target: final \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 85e360b..da24f6d 100644 --- a/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 ports: