wip

Author: jmattheis

.github/workflows/build.yml

@@ -8,25 +8,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Go environment
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.24.x
           stable: true
 
-      - name: Get dependencies
-        run: go get -v -t -d ./...
-
-      - name: Build
-        run: |
-          TAG=$(git describe --tags --abbrev=0)
-          GIT_TAG=$TAG make clean build
+      - run: go get -v -t -d ./...
+      - run: make VERSION=${GITHUB_REF/refs\/tags\/v/} clean build
 
-      - name: Create release
-        uses: svenstaro/upload-release-action@v2
+      - uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: build/*
@@ -44,38 +35,26 @@ jobs:
       id-token: write
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - name: Store version in environment variable if this is a release tag
-        if: startsWith(github.ref, 'refs/tags/v')
+      - if: startsWith(github.ref, 'refs/tags/v')
         run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
-
-      - name: Enable images push
-        if: ${{ startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/v') }}
+      - if: ${{ startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/v') }}
         run: echo "DOCKER_BUILD_PUSH=true" >> $GITHUB_ENV
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Authenticate to Docker Hub registry
-        uses: docker/login-action@v3
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
-
-      - name: Authenticate to Github Container registry
-        uses: docker/login-action@v3
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      - name: Build and push the images
-        run: |
-          make REGISTRY=docker.io IMAGE=${{ github.repository }} build-docker-multiarch
-          make REGISTRY=ghcr.io IMAGE=${{ github.repository }} build-docker-multiarch
+      - run: |
+          make REGISTRY=docker.io build-docker-multiarch
+          make REGISTRY=ghcr.io build-docker-multiarch

Makefile

@@ -1,31 +1,28 @@
 SHELL := /bin/bash
 
 # Env var inputs for container image builds
-# REGISTRY: The registry to which the build image should be pushed to.  Defaults to "docker.io" (Docker Hub)
-# IMAGE: The name of the image to build and publish in the afore mentioned registry.  Defaults to "gotify/cli"
-# PLATFORM: The platform for which the image should be built, defaults to amd64, arm64, i386, arm/v7 and riscv64
+# REGISTRY: The registry to which the build image should be pushed to.
+# IMAGE: The name of the image to build and publish in the afore mentioned registry.
+# PLATFORM: The platform for which the image should be built
 REGISTRY ?= docker.io
 IMAGE ?= gotify/cli
 PLATFORM ?= linux/amd64,linux/arm64,linux/386,linux/arm/v7,linux/riscv64
 
 # Env var inputs for all builds
-# VERSION: The version for which the container image or the binary is being built.  This variable has not default.
+# VERSION: The version for which the container image or the binary is being built.
 #          When it is not provided, no version will be specified in the built package.
 # COMMIT: The commit of this project for which the cli is being built, for reference in the tool's "version" command.
-#         Default to git's HEAD
-# LD_FLAGS: Build flags, for the tool's "version" command.  Defaults to current date, commit and version (if any).
+# LD_FLAGS: Build flags, for the tool's "version" command.
 COMMIT ?= $(shell git rev-parse --verify HEAD)
 LD_FLAGS ?= $(if $(VERSION),-X main.Version=${VERSION}) \
 	-X main.BuildDate=$(shell date "+%F-%T") \
 	-X main.Commit=${COMMIT}
 
-# Resolve go version
 ifdef GOTOOLCHAIN
 	GO_VERSION=$(GOTOOLCHAIN)
 else
 	GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
 endif
-DOCKER_GO_BUILD=go build -mod=readonly -a -installsuffix cgo -ldflags "$$LD_FLAGS"
 
 build-docker-multiarch:
 	docker buildx build \
@@ -40,9 +37,8 @@ build-docker-multiarch:
 		--platform $(PLATFORM) \
 		-f docker/Dockerfile .
 
-_build_within_docker: OUTPUT = gotify-cli
-_build_within_docker:
-	${DOCKER_GO_BUILD} -o ${OUTPUT}
+clean:
+	rm -rf build
 
 build:
 	CGO_ENABLED=0 GOOS=windows GOARCH=amd64       go build -ldflags="${LD_FLAGS}" -o build/gotify-cli-windows-amd64.exe cli.go

docker/Dockerfile

@@ -1,26 +1,23 @@
 ARG BUILDKIT_SBOM_SCAN_CONTEXT=true
-# Suppress warning about invalid variable expansion
 ARG GO_VERSION=PLEASE_PROVIDE_GO_VERSION
-ARG DEBIAN=sid-slim
 ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-
-# Hack to normalize platform to match the chosed build image
-# Get the gotify/build image tag
-ARG __TARGETPLATFORM_DASHES=${TARGETPLATFORM/\//-}
-ARG __TARGETPLATFORM_GO_NOTATION=${__TARGETPLATFORM_DASHES/arm\/v7/arm-7}
 
-# --- Go Builder ---
 FROM --platform=${BUILDPLATFORM} docker.io/golang:${GO_VERSION}-alpine AS builder
 
-ARG LD_FLAGS=""
+ARG TARGETPLATFORM
+ARG TARGETOS
+ARG TARGETARCH
+ARG LD_FLAGS
 
+WORKDIR /src
 RUN apk add --no-cache ca-certificates git make bash
 
-COPY . /src/gotify
+COPY . /src
 
-RUN cd /src/gotify && \
-    LD_FLAGS=${LD_FLAGS} make OUTPUT=/target/app/gotify-cli _build_within_docker
+RUN GOOS=${TARGETOS} \
+    GOARCH=${TARGETARCH} \
+    GOARM=$(echo $TARGETPLATFORM | sed -En 's|^linux/arm/v(.*)|\1|p') \
+    go build -mod=readonly -a -installsuffix cgo -ldflags "${LD_FLAGS}" -o /target/app/gotify-cli
 
 FROM docker.io/library/alpine:latest