From 352d7ed8ee35542fcf75d1a25c689092f399aec8 Mon Sep 17 00:00:00 2001
From: "Max T. Kristiansen" <me@maxtrier.dk>
Date: Sat, 27 Jul 2024 19:48:10 +0200
Subject: [PATCH 1/3] ci: Change Docker tag format to be more general

---
 .build/Build.Docker.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.build/Build.Docker.cs b/.build/Build.Docker.cs
index e8450db..d0efaa9 100644
--- a/.build/Build.Docker.cs
+++ b/.build/Build.Docker.cs
@@ -10,9 +10,11 @@ partial class Build : NukeBuild
 {
     private string DockerImage => $"ghcr.io/fetcharr/fetcharr";
 
-    private string DockerTag => GitVersion.SemVer;
+    private string[] DockerVersionTags => GitVersion.BranchName.Equals("develop", StringComparison.InvariantCultureIgnoreCase)
+        ? ["develop", $"develop-{GitVersion.MajorMinorPatch}.{GitVersion.PreReleaseNumber}"]
+        : ["latest", $"{GitVersion.Major}", $"{GitVersion.Major}.{GitVersion.Minor}", $"{GitVersion.MajorMinorPatch}"];
 
-    private string DockerImageTag => $"{DockerImage}:{DockerTag}";
+    private string[] DockerImageTags => DockerVersionTags.Select(version => $"{DockerImage}:{version}").ToArray();
 
     private string[] DockerImagePlatforms => ["linux/amd64", "linux/arm", "linux/arm64"];
 
@@ -24,7 +26,7 @@ partial class Build : NukeBuild
             DockerBuildxBuild(x => x
                 .SetPath(".")
                 .SetFile("Dockerfile")
-                .SetTag(this.DockerImageTag)
+                .SetTag(this.DockerImageTags)
                 .SetPlatform(string.Join(",", this.DockerImagePlatforms))
                 .SetPush(true)
                 .AddCacheFrom("type=gha")

From b3add80f1dc9facc94285c70d09525de18f1a117 Mon Sep 17 00:00:00 2001
From: "Max T. Kristiansen" <me@maxtrier.dk>
Date: Sat, 27 Jul 2024 19:48:18 +0200
Subject: [PATCH 2/3] chore: Update NUKE schema

---
 .nuke/build.schema.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
index c183c1d..acbaa54 100644
--- a/.nuke/build.schema.json
+++ b/.nuke/build.schema.json
@@ -84,7 +84,6 @@
               "Clean",
               "Compile",
               "Format",
-              "PushImage",
               "Release",
               "Restore",
               "Test"
@@ -101,7 +100,6 @@
               "Clean",
               "Compile",
               "Format",
-              "PushImage",
               "Release",
               "Restore",
               "Test"

From d29c39363bba800ba67bf06a4d59e53af6aa0ecf Mon Sep 17 00:00:00 2001
From: "Max T. Kristiansen" <me@maxtrier.dk>
Date: Sat, 27 Jul 2024 19:51:21 +0200
Subject: [PATCH 3/3] ci: Swap branch conditional

---
 .build/Build.Docker.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.build/Build.Docker.cs b/.build/Build.Docker.cs
index d0efaa9..fcc50c9 100644
--- a/.build/Build.Docker.cs
+++ b/.build/Build.Docker.cs
@@ -10,9 +10,9 @@ partial class Build : NukeBuild
 {
     private string DockerImage => $"ghcr.io/fetcharr/fetcharr";
 
-    private string[] DockerVersionTags => GitVersion.BranchName.Equals("develop", StringComparison.InvariantCultureIgnoreCase)
-        ? ["develop", $"develop-{GitVersion.MajorMinorPatch}.{GitVersion.PreReleaseNumber}"]
-        : ["latest", $"{GitVersion.Major}", $"{GitVersion.Major}.{GitVersion.Minor}", $"{GitVersion.MajorMinorPatch}"];
+    private string[] DockerVersionTags => GitVersion.BranchName.Equals("main", StringComparison.InvariantCultureIgnoreCase)
+        ? ["latest", $"{GitVersion.Major}", $"{GitVersion.Major}.{GitVersion.Minor}", $"{GitVersion.MajorMinorPatch}"]
+        : ["develop", $"develop-{GitVersion.MajorMinorPatch}.{GitVersion.PreReleaseNumber}"];
 
     private string[] DockerImageTags => DockerVersionTags.Select(version => $"{DockerImage}:{version}").ToArray();