From 913783cf08dad389a8398cbcb11b5d33949b7d14 Mon Sep 17 00:00:00 2001
From: Aaron Guise <aaron@guise.net.nz>
Date: Tue, 2 Apr 2024 22:11:58 +1300
Subject: [PATCH 1/2] fix(ci): Updated architecture types to align docker
 image. :wrench:

---
 .release.yml    | 10 +++++-----
 .woodpecker.yml | 44 ++++++++++++++++++++++----------------------
 Dockerfile      | 19 ++++++-------------
 3 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/.release.yml b/.release.yml
index 1a69e58..cb45f00 100644
--- a/.release.yml
+++ b/.release.yml
@@ -8,15 +8,15 @@ branch:
   master: release
   develop: beta
 assets:
-  - name: ./build/go-semantic-release.linux_x86_64
+  - path: ./build/go-semantic-release.linux_amd64
     compress: true
-  - name: ./build/go-semantic-release.linux_arm64
+  - path: ./build/go-semantic-release.linux_arm64
     compress: true
-  - name: ./build/go-semantic-release.windows_i386.exe
+  - path: ./build/go-semantic-release.windows_i386.exe
     compress: true
-  - name: ./build/go-semantic-release.windows_x86_64.exe
+  - path: ./build/go-semantic-release.windows_amd64.exe
     compress: true
-  - name: ./build/go-semantic-release.darwin_x86_64
+  - path: ./build/go-semantic-release.darwin_amd64
     compress: true
 changelog:
   docker:
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 8c55a45..1784a4b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -26,7 +26,7 @@ steps:
           GOOS=linux 
           GOARCH=amd64 
           CGO_ENABLED=0 
-          go build -o build/go-semantic-release.linux_x86_64 -ldflags "-w -s --X main.version=`go-semantic-release next`" 
+          go build -o build/go-semantic-release.linux_amd64 -ldflags "-w -s --X main.version=`go-semantic-release next`" 
           ./cmd/go-semantic-release/
       - > 
           GOOS=linux 
@@ -44,13 +44,13 @@ steps:
           GOOS=windows 
           GOARCH=amd64 
           CGO_ENABLED=0 
-          go build -o build/go-semantic-release.windows_x86_64.exe -ldflags "-w -s -X main.version=`go-semantic-release next`" 
+          go build -o build/go-semantic-release.windows_amd64.exe -ldflags "-w -s -X main.version=`go-semantic-release next`" 
           ./cmd/go-semantic-release/
       - >
           GOOS=darwin 
           GOARCH=amd64 
           CGO_ENABLED=0 
-          go build -o build/go-semantic-release.darwin_x86_64 -ldflags "-w -s -X main.version=`go-semantic-release next`" 
+          go build -o build/go-semantic-release.darwin_amd64 -ldflags "-w -s -X main.version=`go-semantic-release next`" 
           ./cmd/go-semantic-release/
       - go-semantic-release --loglevel debug release # Actually make the release on Gitea.  Uploading assets
     environment:
@@ -64,25 +64,25 @@ steps:
         - push
         - manual
 
-  # publish-docker-tagged:
-  #   image: docker.io/cybercinch/woodpecker-plugin-depot
-  #   pull: true
-  #   settings:
-  #     <<: *docker_creds
-  #     token: 
-  #       from_secret: depot_token
-  #     repohost: hub.cybercinch.nz
-  #     repo: cybercinch/${CI_REPO_NAME}
-  #     project: 
-  #       from_secret: depot_project
-  #     dockerfile: Dockerfile
-  #     push: true
-  #     platforms: *platforms
-  #     tags: ["latest", "$CI_COMMIT_TAG"]
-  #   when:
-  #     branch: ${CI_REPO_DEFAULT_BRANCH}
-  #     event: 
-  #       - tag
+  publish-docker-tagged:
+    image: docker.io/cybercinch/woodpecker-plugin-depot
+    pull: true
+    settings:
+      <<: *docker_creds
+      token: 
+        from_secret: depot_token
+      repohost: hub.cybercinch.nz
+      repo: cybercinch/${CI_REPO_NAME}
+      project: 
+        from_secret: depot_project
+      dockerfile: Dockerfile
+      push: true
+      platforms: *platforms
+      tags: ["latest", "$CI_COMMIT_TAG"]
+    when:
+      branch: ${CI_REPO_DEFAULT_BRANCH}
+      event: 
+        - tag
 
   publish-docker-develop:
     image: docker.io/cybercinch/woodpecker-plugin-depot
diff --git a/Dockerfile b/Dockerfile
index 7df55b3..1161837 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,13 @@
-FROM golang:1.20
-
-WORKDIR /code
-
-COPY . /code/
-
-RUN GOOS=linux \
-    GOARCH=amd64 \
-    CGO_ENABLED=0 \ 
-    go build -o build/go-semantic-release.linux_x86_64 -ldflags "-w -s --X main.version=`go-semantic-release next`" \ 
-    ./cmd/go-semantic-release/
-
 FROM alpine:3.14
+ARG TARGETPLATFORM
+ARG TAG=v2.2.3
 
 WORKDIR /code
 
-COPY ./build/go-semantic-release.linux_x86_64 /usr/local/bin/go-semantic-release
+ADD https://hub.cybercinch.nz/cybercinch/go-semantic-release/releases/download/${TAG}/go-semantic-release.linux_${TARGETPLATFORM//"linux/"/}.zip /tmp
+RUN unzip /tmp/go-semantic-release.linux_${TARGETPLATFORM//"linux/"/}.zip && \
+    mv /tmp/go-semantic-release.linux_${TARGETPLATFORM//"linux/"/} /usr/local/bin/go-semantic-release && \
+    rm -f /tmp/go-semantic-release.linux_${TARGETPLATFORM//"linux/"/}.zip
 
 USER 1000
 
-- 
2.49.1


From b38abd00f2fc948e3bcd3e9e4dd752a6e1344a30 Mon Sep 17 00:00:00 2001
From: Aaron Guise <aaron@guise.net.nz>
Date: Tue, 2 Apr 2024 22:52:54 +1300
Subject: [PATCH 2/2] fix(ci): Send build-arg to depot

---
 .woodpecker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 1784a4b..ec0ac28 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -78,6 +78,7 @@ steps:
       dockerfile: Dockerfile
       push: true
       platforms: *platforms
+      buildargs: ["TAG=${CI_COMMIT_TAG}"]
       tags: ["latest", "$CI_COMMIT_TAG"]
     when:
       branch: ${CI_REPO_DEFAULT_BRANCH}
-- 
2.49.1