Merge pull request #3746 from thaJeztah/20.10_backport_bump_go_1.18

[20.10 backport] Update golang to 1.18.5
This commit is contained in:
Sebastiaan van Stijn 2022-08-19 17:19:47 +02:00 committed by GitHub
commit 0785bd743d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 14 deletions

View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.3
# syntax=docker/dockerfile:1
ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.17.13
ARG GO_VERSION=1.18.5
ARG XX_VERSION=1.1.0
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

View File

@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
environment:
GOPATH: c:\gopath
GOVERSION: 1.17.13
GOVERSION: 1.18.5
DEPVERSION: v0.4.1
install:

View File

@ -1,5 +1,5 @@
variable "GO_VERSION" {
default = "1.17.13"
default = "1.18.5"
}
variable "VERSION" {
default = ""

View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.17.13
ARG GO_VERSION=1.18.5
FROM golang:${GO_VERSION}-alpine

View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.3
# syntax=docker/dockerfile:1
ARG GO_VERSION=1.17.13
ARG GO_VERSION=1.18.5
FROM golang:${GO_VERSION}-alpine AS golang
ENV CGO_ENABLED=0

View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.17.13
ARG GO_VERSION=1.18.5
# Use Debian based image as docker-compose requires glibc.
FROM golang:${GO_VERSION}-buster

View File

@ -1,16 +1,16 @@
# syntax=docker/dockerfile:1.3
# syntax=docker/dockerfile:1
ARG GO_VERSION=1.17.13
ARG GOLANGCI_LINTER_SHA=v1.45.2
ARG GO_VERSION=1.18.5
ARG GOLANGCI_LINT_VERSION=v1.45.2
FROM golang:${GO_VERSION}-alpine AS build
ENV CGO_ENABLED=0
RUN apk add --no-cache git
ARG GOLANGCI_LINTER_SHA
ARG GOLANGCI_LINT_VERSION
ARG GO111MODULE=on
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
go get github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINTER_SHA}
go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
FROM golang:${GO_VERSION}-alpine AS lint
ENV GO111MODULE=off

View File

@ -20,7 +20,7 @@ var basicFunctions = template.FuncMap{
},
"split": strings.Split,
"join": strings.Join,
"title": strings.Title,
"title": strings.Title, //nolint:staticcheck // strings.Title is deprecated, but we only use it for ASCII, so replacing with golang.org/x/text is out of scope
"lower": strings.ToLower,
"upper": strings.ToUpper,
"pad": padWithSpace,