.woodpecker/1-build-check-docker.yml

@@ -1,24 +0,0 @@
-matrix:
-  GO_GOOS:
-    - linux
-  GO_GOARCH:
-    - amd64
-    - arm64
-
-steps:
-  - name: test/build-docker/${GO_GOOS}-${GO_GOARCH}
-    image: woodpeckerci/plugin-docker-buildx:5.2.2
-    settings:
-      platforms: ${GO_GOOS}/${GO_GOARCH}
-      dry-run: true
-      purge: true
-      build_args:
-        - I_PACKAGE="git.hackmi.ch/Phil/goshorly/utils"
-
-when:
-  - event: [push, cron]
-    branch: [main, develop]
-  - event: pull_request
-
-depends_on:
-  - 0-pre

.woodpecker/1-build-check.yml

@@ -1,21 +1,20 @@
-matrix:
-  GO_GOOS:
-    - linux
-    - windows
-  GO_GOARCH:
-    - amd64
-    - arm64
-
 steps:
-  - name: test/build-binary/${GO_GOOS}-${GO_GOARCH}
+  - name: test/build-binary/linux-amd64
     image: golang:1.24.2
     environment:
-      GOOS: ${GO_GOOS}
-      GOARCH: ${GO_GOARCH}
       I_PACKAGE: "git.hackmi.ch/Phil/goshorly/utils"
       CGO_ENABLED: 0
     commands:
-      - go build -a -installsuffix cgo -ldflags=" -X $I_PACKAGE.CI_COMMIT_SHA=$CI_COMMIT_SHA -X $I_PACKAGE.CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH -X $I_PACKAGE.CI_COMMIT_TAG=$CI_COMMIT_TAG" -o app-${GO_GOOS}-${GO_GOARCH} .
+      - export CI_COMMIT_SHA=${CI_COMMIT_SHA}
+      - go build -a -installsuffix cgo -ldflags=" -X $I_PACKAGE.CI_COMMIT_SHA=$CI_COMMIT_SHA -X $I_PACKAGE.CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH -X $I_PACKAGE.CI_COMMIT_TAG=$CI_COMMIT_TAG" -o app .
+
+  - name: test/build-docker/linux-amd64
+    image: woodpeckerci/plugin-docker-buildx:5.2.2
+    settings:
+      dry-run: true
+      repo: git.hackmi.ch/phil/goshorly
+      registry: git.hackmi.ch
+      platforms: linux/amd64
 
 when:
   - event: [push, cron]

.woodpecker/10-build-main.yml

@@ -5,6 +5,7 @@ steps:
       I_PACKAGE: "git.hackmi.ch/Phil/goshorly/utils"
       CGO_ENABLED: 0
     commands:
+      - export CI_COMMIT_SHA=${CI_COMMIT_SHA}
       - go build -a -installsuffix cgo -ldflags=" -X $I_PACKAGE.CI_COMMIT_SHA=$CI_COMMIT_SHA -X $I_PACKAGE.CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH -X $I_PACKAGE.CI_COMMIT_TAG=$CI_COMMIT_TAG" -o app .
     when:
       - event: [push, cron]
@@ -16,12 +17,10 @@ steps:
       I_PACKAGE: "git.hackmi.ch/Phil/goshorly/utils"
       CGO_ENABLED: 0
     settings:
-      platforms: linux/amd64,linux/arm64
+      platforms: linux/amd64,linux/arm/v6,linux/arm64/v8
       repo: git.hackmi.ch/phil/goshorly
       registry: git.hackmi.ch
       tags: dev
-      build_args:
-        - I_PACKAGE="git.hackmi.ch/Phil/goshorly/utils"
       username:
         from_secret: reg-user
       password:
@@ -32,6 +31,16 @@ steps:
       - event: [push, cron]
         branch: main
 
+services:
+  docker-daemon:
+    image: docker:28.0-dind-rootless
+    commands:
+      - dockerd --tls=false --host=tcp://0.0.0.0:2376
+    privileged: true
+    when:
+    - event: [push, cron]
+      branch: main
+
 when:
   - event: [push, cron]
     branch: main

Dockerfile

@@ -1,9 +1,5 @@
 FROM golang:1.24.2-alpine as builder
 
-ARG I_PACKAGE
-
-ENV I_PACKAGE=$I_PACKAGE
-
 RUN apk add --no-cache git make build-base
 
 WORKDIR /go/src/git.hackmi.ch/goshorly