From 3509a1a7ff6e87a155bae0e4877973ddd618a449 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Thu, 11 Aug 2022 02:04:41 +0200 Subject: [PATCH 1/2] Dockerfile: update to go 1.19 Signed-off-by: CrazyMax --- 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 562d93b3..a1556c69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -ARG GO_VERSION=1.18 +ARG GO_VERSION=1.19 ARG XX_VERSION=1.1.2 ARG DOCKERD_VERSION=20.10.14 diff --git a/docker-bake.hcl b/docker-bake.hcl index 11c0ab0a..4fa45b7f 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ variable "GO_VERSION" { - default = "1.18" + default = "1.19" } variable "BIN_OUT" { default = "./bin" diff --git a/hack/dockerfiles/docs.Dockerfile b/hack/dockerfiles/docs.Dockerfile index c0dea73a..288b9c33 100644 --- a/hack/dockerfiles/docs.Dockerfile +++ b/hack/dockerfiles/docs.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -ARG GO_VERSION=1.18 +ARG GO_VERSION=1.19 ARG FORMATS=md,yaml FROM golang:${GO_VERSION}-alpine AS docsgen diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index 575af277..f7f496e1 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -ARG GO_VERSION=1.18 +ARG GO_VERSION=1.19 FROM golang:${GO_VERSION}-alpine RUN apk add --no-cache git gcc musl-dev diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index 0bec0685..7b0b3c3b 100644 --- a/hack/dockerfiles/vendor.Dockerfile +++ b/hack/dockerfiles/vendor.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -ARG GO_VERSION=1.18 +ARG GO_VERSION=1.19 ARG MODOUTDATED_VERSION=v0.8.0 FROM golang:${GO_VERSION}-alpine AS base From 2a134919197dd68f49faebea43cfefee9dac45d6 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Thu, 11 Aug 2022 02:09:55 +0200 Subject: [PATCH 2/2] Dockerfile: update golangci-lint to 1.48.0 (go 1.19 support) Signed-off-by: CrazyMax --- hack/dockerfiles/lint.Dockerfile | 2 +- util/userfunc/doc.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index f7f496e1..bbff367c 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -4,7 +4,7 @@ ARG GO_VERSION=1.19 FROM golang:${GO_VERSION}-alpine RUN apk add --no-cache git gcc musl-dev -RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.45.2 +RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.48.0 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 diff --git a/util/userfunc/doc.go b/util/userfunc/doc.go index e4461d45..995d9289 100644 --- a/util/userfunc/doc.go +++ b/util/userfunc/doc.go @@ -7,10 +7,10 @@ // // The function declaration syntax looks like this: // -// function "foo" { -// params = ["name"] -// result = "Hello, ${name}!" -// } +// function "foo" { +// params = ["name"] +// result = "Hello, ${name}!" +// } // // When a user-defined function is called, the expression given for the "result" // attribute is evaluated in an isolated evaluation context that defines variables