Skip to content

Commit 06fa9d5

Browse files
committed
build(docker): Fix version details in docker image
As part of golangci#1383, multi-arch docker build was supported. However, ldflags for version details was missing. This commit is to add -ldflags as part of Docker build. Fixes golangci#1468 Signed-off-by: Tam Mach <[email protected]>
1 parent f414375 commit 06fa9d5

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

.github/workflows/tag.yml

+8
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ jobs:
4545
file: build/Dockerfile
4646
platforms: linux/amd64,linux/arm64
4747
push: true
48+
build-args: |
49+
VERSION=${{ steps.prepare.outputs.tag_name }}
50+
SHORT_COMMIT=${GITHUB_SHA::8}
51+
DATE=$(date '+%Y-%m-%dT%H:%M:%SZ')
4852
tags: |
4953
golangci/golangci-lint:${{ steps.prepare.outputs.tag_name }}
5054
golangci/golangci-lint:${{ steps.prepare.outputs.major_tag }}
@@ -56,6 +60,10 @@ jobs:
5660
context: .
5761
file: build/Dockerfile.alpine
5862
platforms: linux/amd64,linux/arm64
63+
build-args: |
64+
VERSION=${{ steps.prepare.outputs.tag_name }}
65+
SHORT_COMMIT=${GITHUB_SHA::8}
66+
DATE=$(date '+%Y-%m-%dT%H:%M:%SZ')
5967
push: true
6068
tags: |
6169
golangci/golangci-lint:${{ steps.prepare.outputs.tag_name }}-alpine

build/Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# stage 1 building the code
22
FROM golang:1.15 as builder
33

4+
ARG VERSION
5+
ARG SHORT_COMMIT
6+
ARG DATE
7+
48
COPY / /golangci
59
WORKDIR /golangci
6-
RUN go build -o golangci-lint ./cmd/golangci-lint/main.go
10+
RUN go build -s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE -o golangci-lint ./cmd/golangci-lint/main.go
711

812
# stage 2
913
FROM golang:1.15

build/Dockerfile.alpine

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# stage 1 building the code
22
FROM golang:1.15-alpine as builder
33

4+
ARG VERSION
5+
ARG SHORT_COMMIT
6+
ARG DATE
7+
48
COPY / /golangci
59
WORKDIR /golangci
6-
RUN CGO_ENABLED=0 go build -o golangci-lint ./cmd/golangci-lint/main.go
10+
RUN go build -s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE -o golangci-lint ./cmd/golangci-lint/main.go
711

812
# stage 2
913
FROM golang:1.15-alpine

0 commit comments

Comments
 (0)