mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #43194 from thaJeztah/bump_golang_1.18
Update golang to 1.18.0
This commit is contained in:
commit
7f99438ce7
6 changed files with 6 additions and 6 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
ARG CROSS="false"
|
ARG CROSS="false"
|
||||||
ARG SYSTEMD="false"
|
ARG SYSTEMD="false"
|
||||||
ARG GO_VERSION=1.17.8
|
ARG GO_VERSION=1.18.0
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
ARG VPNKIT_VERSION=0.5.0
|
ARG VPNKIT_VERSION=0.5.0
|
||||||
ARG DOCKER_BUILDTAGS="apparmor seccomp"
|
ARG DOCKER_BUILDTAGS="apparmor seccomp"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ARG GO_VERSION=1.17.8
|
ARG GO_VERSION=1.18.0
|
||||||
|
|
||||||
FROM golang:${GO_VERSION}-alpine AS base
|
FROM golang:${GO_VERSION}-alpine AS base
|
||||||
ENV GO111MODULE=off
|
ENV GO111MODULE=off
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
# This represents the bare minimum required to build and test Docker.
|
# This represents the bare minimum required to build and test Docker.
|
||||||
|
|
||||||
ARG GO_VERSION=1.17.8
|
ARG GO_VERSION=1.18.0
|
||||||
|
|
||||||
ARG BASE_DEBIAN_DISTRO="bullseye"
|
ARG BASE_DEBIAN_DISTRO="bullseye"
|
||||||
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
|
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
|
||||||
|
|
|
@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
|
||||||
# Use PowerShell as the default shell
|
# Use PowerShell as the default shell
|
||||||
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
|
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
|
||||||
|
|
||||||
ARG GO_VERSION=1.17.8
|
ARG GO_VERSION=1.18.0
|
||||||
ARG CONTAINERD_VERSION=1.6.1
|
ARG CONTAINERD_VERSION=1.6.1
|
||||||
ARG GOTESTSUM_VERSION=v1.7.0
|
ARG GOTESTSUM_VERSION=v1.7.0
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ var basicFunctions = template.FuncMap{
|
||||||
},
|
},
|
||||||
"split": strings.Split,
|
"split": strings.Split,
|
||||||
"join": strings.Join,
|
"join": strings.Join,
|
||||||
"title": strings.Title,
|
"title": strings.Title, //nolint:staticcheck // SA1019: strings.Title is deprecated: The rule Title uses for word boundaries does not handle Unicode punctuation properly. Use golang.org/x/text/cases instead.
|
||||||
"lower": strings.ToLower,
|
"lower": strings.ToLower,
|
||||||
"upper": strings.ToUpper,
|
"upper": strings.ToUpper,
|
||||||
"pad": padWithSpace,
|
"pad": padWithSpace,
|
||||||
|
|
|
@ -64,7 +64,7 @@ func title(s string) string {
|
||||||
if strings.ToLower(s) == "id" {
|
if strings.ToLower(s) == "id" {
|
||||||
return "ID"
|
return "ID"
|
||||||
}
|
}
|
||||||
return strings.Title(s)
|
return strings.Title(s) //nolint:staticcheck // SA1019: strings.Title is deprecated: The rule Title uses for word boundaries does not handle Unicode punctuation properly. Use golang.org/x/text/cases instead.
|
||||||
}
|
}
|
||||||
|
|
||||||
var generatedTempl = template.Must(template.New("rpc_cient").Funcs(templFuncs).Parse(`
|
var generatedTempl = template.Must(template.New("rpc_cient").Funcs(templFuncs).Parse(`
|
||||||
|
|
Loading…
Reference in a new issue