Skip to content

Commit d3705d0

Browse files
authored
Build docker images with go1.17 (#2188)
1 parent 43b941d commit d3705d0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fast_generate: assets/github-action-config.json
4444

4545
fast_check_generated:
4646
$(MAKE) --always-make fast_generate
47-
git checkout -- go.mod go.sum # can differ between go1.15 and go1.16
47+
git checkout -- go.mod go.sum # can differ between go1.16 and go1.17
4848
git diff --exit-code # check no changes
4949

5050
release: .goreleaser.yml tools/goreleaser

build/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# stage 1 building the code
2-
FROM golang:1.16 as builder
2+
FROM golang:1.17 as builder
33

44
ARG VERSION
55
ARG SHORT_COMMIT
@@ -10,7 +10,7 @@ WORKDIR /golangci
1010
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
1111

1212
# stage 2
13-
FROM golang:1.16
13+
FROM golang:1.17
1414
# don't place it into $GOPATH/bin because Drone mounts $GOPATH as volume
1515
COPY --from=builder /golangci/golangci-lint /usr/bin/
1616
CMD ["golangci-lint"]

build/Dockerfile.alpine

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# stage 1 building the code
2-
FROM golang:1.16-alpine as builder
2+
FROM golang:1.17-alpine as builder
33

44
ARG VERSION
55
ARG SHORT_COMMIT
@@ -15,7 +15,7 @@ RUN apk --no-cache add gcc musl-dev git mercurial
1515
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
1616

1717
# stage 2
18-
FROM golang:1.16-alpine
18+
FROM golang:1.17-alpine
1919
# gcc is required to support cgo;
2020
# git and mercurial are needed most times for go get`, etc.
2121
# See https://github.com/docker-library/golang/issues/80

0 commit comments

Comments
 (0)