Skip to content

Commit 95bc7a8

Browse files
alebcayldez
andauthored
fix: make versioning inside Docker image consistent with binaries (#4279)
Co-authored-by: Fernandez Ludovic <[email protected]>
1 parent bd8cb77 commit 95bc7a8

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Diff for: build/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ ARG DATE
77

88
COPY / /golangci
99
WORKDIR /golangci
10-
RUN CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE" -o golangci-lint ./cmd/golangci-lint/main.go
10+
RUN APP_VERSION=${VERSION#v} \
11+
CGO_ENABLED=0 \
12+
go build -trimpath -ldflags "-s -w -X main.version=$APP_VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE" -o golangci-lint ./cmd/golangci-lint/main.go
1113

1214
# stage 2
1315
FROM golang:1.21

Diff for: build/alpine.Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ WORKDIR /golangci
1212
# git and mercurial are needed most times for go get`, etc.
1313
# See https://github.com/docker-library/golang/issues/80
1414
RUN apk --no-cache add gcc musl-dev git mercurial
15-
RUN CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE" -o golangci-lint ./cmd/golangci-lint/main.go
15+
RUN APP_VERSION=${VERSION#v} \
16+
CGO_ENABLED=0 \
17+
go build -trimpath -ldflags "-s -w -X main.version=$APP_VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE" -o golangci-lint ./cmd/golangci-lint/main.go
1618

1719
# stage 2
1820
FROM golang:1.21-alpine

0 commit comments

Comments
 (0)