From 0b9d426175e300bf6a88d1517709e3ce0bbd4575 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 5 Apr 2022 16:59:22 -0700 Subject: [PATCH 1/2] Dockerfile: update to go 1.18 Signed-off-by: Tonis Tiigi --- Dockerfile | 2 +- docker-bake.hcl | 2 +- hack/dockerfiles/docs.Dockerfile | 2 +- hack/dockerfiles/lint.Dockerfile | 2 +- hack/dockerfiles/vendor.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c5f3653..13539765 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -ARG GO_VERSION=1.17 +ARG GO_VERSION=1.18 ARG DOCKERD_VERSION=20.10.14 FROM docker:$DOCKERD_VERSION AS dockerd-release diff --git a/docker-bake.hcl b/docker-bake.hcl index 3d07c460..11c0ab0a 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ variable "GO_VERSION" { - default = "1.17" + default = "1.18" } variable "BIN_OUT" { default = "./bin" diff --git a/hack/dockerfiles/docs.Dockerfile b/hack/dockerfiles/docs.Dockerfile index d2805315..c0dea73a 100644 --- a/hack/dockerfiles/docs.Dockerfile +++ b/hack/dockerfiles/docs.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -ARG GO_VERSION=1.17 +ARG GO_VERSION=1.18 ARG FORMATS=md,yaml FROM golang:${GO_VERSION}-alpine AS docsgen diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index 89b63459..321ef43f 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -ARG GO_VERSION=1.17 +ARG GO_VERSION=1.18 FROM golang:${GO_VERSION}-alpine RUN apk add --no-cache gcc musl-dev yamllint diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index 387e07d9..04217728 100644 --- a/hack/dockerfiles/vendor.Dockerfile +++ b/hack/dockerfiles/vendor.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -ARG GO_VERSION=1.17 +ARG GO_VERSION=1.18 ARG MODOUTDATED_VERSION=v0.8.0 FROM golang:${GO_VERSION}-alpine AS base From a648d58f63a77cd5caf51420acbf26f6bffa0f23 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 5 Apr 2022 17:24:37 -0700 Subject: [PATCH 2/2] hack: update linters Signed-off-by: Tonis Tiigi --- hack/dockerfiles/lint.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index 321ef43f..61ecb369 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -3,8 +3,8 @@ ARG GO_VERSION=1.18 FROM golang:${GO_VERSION}-alpine -RUN apk add --no-cache gcc musl-dev yamllint -RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.36.0 +RUN apk add --no-cache git gcc musl-dev yamllint +RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.45.2 WORKDIR /go/src/github.com/docker/buildx RUN --mount=target=/go/src/github.com/docker/buildx --mount=target=/root/.cache,type=cache \ golangci-lint run