Skip to content

Commit 34742e6

Browse files
committed
add trimpath for build
improve log source info Signed-off-by: Markus Blaschke <[email protected]>
1 parent edcbcef commit 34742e6

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS build
66
RUN apk upgrade --no-cache --force
77
RUN apk add --update build-base make git
88

9-
WORKDIR /go/src/github.com/webdevops/myuplink-exporter
9+
WORKDIR /go/src /github.com/webdevops/myuplink-exporter
1010

1111
# Dependencies
1212
COPY go.mod go.sum .
@@ -15,7 +15,6 @@ RUN go mod download
1515
# Compile
1616
COPY . .
1717
RUN make test
18-
RUN make build # warmup
1918
ARG TARGETOS TARGETARCH
2019
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build
2120

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ GIT_TAG := $(shell git describe --dirty --tags --always)
33
GIT_COMMIT := $(shell git rev-parse --short HEAD)
44
BUILD_DATE := $(shell TZ=UTC date '+%Y-%m-%dT%H:%M:%SZ')
55
LDFLAGS := -X "main.gitTag=$(GIT_TAG)" -X "main.gitCommit=$(GIT_COMMIT)" -X "main.buildDate=$(BUILD_DATE)" -extldflags "-static" -s -w
6+
BUILDFLAGS := -trimpath
67

78

89
FIRST_GOPATH := $(firstword $(subst :, ,$(shell go env GOPATH)))
@@ -27,13 +28,13 @@ vendor:
2728

2829
.PHONY: build-all
2930
build-all:
30-
GOOS=linux GOARCH=${GOARCH} CGO_ENABLED=0 go build -ldflags '$(LDFLAGS)' -o '$(PROJECT_NAME)' .
31-
GOOS=darwin GOARCH=${GOARCH} CGO_ENABLED=0 go build -ldflags '$(LDFLAGS)' -o '$(PROJECT_NAME).darwin' .
32-
GOOS=windows GOARCH=${GOARCH} CGO_ENABLED=0 go build -ldflags '$(LDFLAGS)' -o '$(PROJECT_NAME).exe' .
31+
GOOS=linux GOARCH=${GOARCH} CGO_ENABLED=0 go build -ldflags '$(LDFLAGS)' $(BUILDFLAGS) -o '$(PROJECT_NAME)' .
32+
GOOS=darwin GOARCH=${GOARCH} CGO_ENABLED=0 go build -ldflags '$(LDFLAGS)' $(BUILDFLAGS) -o '$(PROJECT_NAME).darwin' .
33+
GOOS=windows GOARCH=${GOARCH} CGO_ENABLED=0 go build -ldflags '$(LDFLAGS)' $(BUILDFLAGS) -o '$(PROJECT_NAME).exe' .
3334

3435
.PHONY: build
3536
build:
36-
GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 go build -ldflags '$(LDFLAGS)' -o $(PROJECT_NAME) .
37+
GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 go build -ldflags '$(LDFLAGS)' $(BUILDFLAGS) -o $(PROJECT_NAME) .
3738

3839
.PHONY: image
3940
image: image

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/webdevops/myuplink-exporter
22

3-
go 1.25
3+
go 1.25.0
4+
5+
toolchain go1.25.5
46

57
require (
68
github.com/jessevdk/go-flags v1.6.1

0 commit comments

Comments
 (0)