Set build flags in makefile

Author: edvgui

.github/workflows/build.yml

@@ -55,14 +55,6 @@ jobs:
         if: ${{ startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/tags/v') }}
         run: echo "DOCKER_BUILD_PUSH=true" >> $GITHUB_ENV
 
-      - name: Store commit in environment variable
-        run: echo "COMMIT=${{ github.sha }}" >> $GITHUB_ENV
-
-      - name: Setup build flags
-        run: |
-          export LD_FLAGS="-w -s -X main.Version=$VERSION -X main.BuildDate=$(date "+%F-%T") -X main.Commit=$(git rev-parse --verify HEAD) -X main.Mode=prod"
-          echo "LD_FLAGS=$LD_FLAGS" >> $GITHUB_ENV
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 

Makefile

@@ -1,13 +1,24 @@
 SHELL := /bin/bash
 
-# Env var inputs for container builds
+# 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 ?= 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.
+#          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).
+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)
@@ -16,31 +27,24 @@ else
 endif
 DOCKER_GO_BUILD=go build -mod=readonly -a -installsuffix cgo -ldflags "$$LD_FLAGS"
 
-require-commit:
-	if [ -z ${COMMIT} ]; then echo "Need to set COMMIT" && exit 1; fi;
-
-build-docker-multiarch: require-commit
+build-docker-multiarch:
 	docker buildx build \
-		--sbom=true \
-		--provenance=true \
 		$(if $(DOCKER_BUILD_PUSH),--push) \
 		-t ${REGISTRY}/${IMAGE}:${COMMIT} \
 		$(if $(VERSION),-t ${REGISTRY}/${IMAGE}:latest) \
 		$(if $(VERSION),-t ${REGISTRY}/${IMAGE}:${VERSION}) \
 		$(if $(VERSION),-t ${REGISTRY}/${IMAGE}:$(shell echo $(VERSION) | cut -d '.' -f -2)) \
 		$(if $(VERSION),-t ${REGISTRY}/${IMAGE}:$(shell echo $(VERSION) | cut -d '.' -f -1)) \
 		--build-arg GO_VERSION=$(GO_VERSION) \
-		--build-arg LD_FLAGS="$$LD_FLAGS" \
+		--build-arg LD_FLAGS="$(LD_FLAGS)" \
 		--platform $(PLATFORM) \
 		-f docker/Dockerfile .
 
-_build_within_docker: OUTPUT = gotify-app
+_build_within_docker: OUTPUT = gotify-cli
 _build_within_docker:
 	${DOCKER_GO_BUILD} -o ${OUTPUT}
 
 build:
-	if [ '$(shell echo "${GIT_TAG}" | cut -c 1 )' != 'v' ]; then exit 1; fi;
-	$(eval LD_FLAGS := -X main.Version=$(shell echo ${GIT_TAG} | cut -c 2-) -X main.BuildDate=$(shell date "+%F-%T") -X main.Commit=$(shell git rev-parse --verify HEAD))
 	CGO_ENABLED=0 GOOS=windows GOARCH=amd64       go build -ldflags="${LD_FLAGS}" -o build/gotify-cli-windows-amd64.exe cli.go
 	CGO_ENABLED=0 GOOS=windows GOARCH=386         go build -ldflags="${LD_FLAGS}" -o build/gotify-cli-windows-386.exe   cli.go
 	CGO_ENABLED=0 GOOS=linux   GOARCH=amd64       go build -ldflags="${LD_FLAGS}" -o build/gotify-cli-linux-amd64       cli.go

docker/Dockerfile

@@ -11,8 +11,7 @@ ARG __TARGETPLATFORM_DASHES=${TARGETPLATFORM/\//-}
 ARG __TARGETPLATFORM_GO_NOTATION=${__TARGETPLATFORM_DASHES/arm\/v7/arm-7}
 
 # --- Go Builder ---
-
-FROM --platform=${BUILDPLATFORM} docker.io/golang:1.24 AS builder
+FROM --platform=${BUILDPLATFORM} docker.io/golang:${GO_VERSION} AS builder
 
 ARG LD_FLAGS=""
 ENV DEBIAN_FRONTEND=noninteractive