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 573133ed..651cb452 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 ac58fa56..c78d0b75 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..bbff367c 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,10 +1,10 @@ # 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 -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/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 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