From 95bc7a854689c53758cc302dd3a6895f11e44143 Mon Sep 17 00:00:00 2001 From: Caleb Xu Date: Thu, 21 Dec 2023 19:12:00 -0500 Subject: [PATCH] fix: make versioning inside Docker image consistent with binaries (#4279) Co-authored-by: Fernandez Ludovic --- build/Dockerfile | 4 +++- build/alpine.Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 3c86cb6f..2226a849 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -7,7 +7,9 @@ ARG DATE COPY / /golangci WORKDIR /golangci -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 +RUN APP_VERSION=${VERSION#v} \ + CGO_ENABLED=0 \ + 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 # stage 2 FROM golang:1.21 diff --git a/build/alpine.Dockerfile b/build/alpine.Dockerfile index 35f2626b..a607970e 100644 --- a/build/alpine.Dockerfile +++ b/build/alpine.Dockerfile @@ -12,7 +12,9 @@ WORKDIR /golangci # git and mercurial are needed most times for go get`, etc. # See https://github.com/docker-library/golang/issues/80 RUN apk --no-cache add gcc musl-dev git mercurial -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 +RUN APP_VERSION=${VERSION#v} \ + CGO_ENABLED=0 \ + 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 # stage 2 FROM golang:1.21-alpine