From 9def6fd7b2b9349b83339c5728fabfb94b339fed Mon Sep 17 00:00:00 2001 From: Alex Macocian Date: Sat, 25 Nov 2023 17:16:02 +0100 Subject: [PATCH 1/3] Fix release --- .github/workflows/docker-deploy.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/docker-deploy.yaml b/.github/workflows/docker-deploy.yaml index 331df7f..4aa1815 100644 --- a/.github/workflows/docker-deploy.yaml +++ b/.github/workflows/docker-deploy.yaml @@ -1,6 +1,8 @@ name: Build and Push Docker Image on: + pull_request: + branches: [ master ] push: branches: [ master ] paths: @@ -41,6 +43,11 @@ jobs: docker push guildwarspartysearch.azurecr.io/guildwarspartysearch.server shell: pwsh + - name: Debug + run: | + cd GuildWarsPartySearch/GuildWarsPartySearch/bin/Release/net8.0/publish/ + ls + deploy: needs: build runs-on: ubuntu-latest From 7ecda675f10802095b4b37ee23c0bf95c8239ce4 Mon Sep 17 00:00:00 2001 From: Alex Macocian Date: Sat, 25 Nov 2023 17:17:31 +0100 Subject: [PATCH 2/3] Try 2 --- .github/workflows/docker-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-deploy.yaml b/.github/workflows/docker-deploy.yaml index 4aa1815..0b7d55a 100644 --- a/.github/workflows/docker-deploy.yaml +++ b/.github/workflows/docker-deploy.yaml @@ -45,7 +45,7 @@ jobs: - name: Debug run: | - cd GuildWarsPartySearch/GuildWarsPartySearch/bin/Release/net8.0/publish/ + cd GuildWarsPartySearch/bin/Release/net8.0/publish/ ls deploy: From 672b7b0f3d4698dd972e3a2225a9c0a1a7048049 Mon Sep 17 00:00:00 2001 From: Alex Macocian Date: Sat, 25 Nov 2023 17:23:39 +0100 Subject: [PATCH 3/3] Copy config to publish --- .github/workflows/docker-deploy.yaml | 2 -- GuildWarsPartySearch/BuildDockerImage.ps1 | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-deploy.yaml b/.github/workflows/docker-deploy.yaml index 0b7d55a..30249c9 100644 --- a/.github/workflows/docker-deploy.yaml +++ b/.github/workflows/docker-deploy.yaml @@ -1,8 +1,6 @@ name: Build and Push Docker Image on: - pull_request: - branches: [ master ] push: branches: [ master ] paths: diff --git a/GuildWarsPartySearch/BuildDockerImage.ps1 b/GuildWarsPartySearch/BuildDockerImage.ps1 index 3663e3a..d8aac5d 100644 --- a/GuildWarsPartySearch/BuildDockerImage.ps1 +++ b/GuildWarsPartySearch/BuildDockerImage.ps1 @@ -1,3 +1,4 @@ dotnet publish -c Release +Copy-Item -Path Config.Release.json -Destination ./bin/Release/net8.0/publish/Config.json docker build -t guildwarspartysearch.server . docker tag guildwarspartysearch.server guildwarspartysearch.azurecr.io/guildwarspartysearch.server \ No newline at end of file