Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.10 backport] Update golang to 1.18.5 #3746

Merged
merged 9 commits into from
Aug 19, 2022
Merged

[20.10 backport] Update golang to 1.18.5 #3746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f14ba9f
[20.10] Dockerfile: use syntax=docker/dockerfile:1
thaJeztah Aug 19, 2022
b3022b9
[20.10] Dockerfile.lint: use go install
thaJeztah Aug 19, 2022
86bf196
staticcheck: ignore SA1019: strings.Title is deprecated
thaJeztah Mar 27, 2022
990186f
update go to 1.18.0
thaJeztah Mar 27, 2022
386d50c
update golang to 1.18.1
thaJeztah Apr 19, 2022
c904936
update golang to 1.18.2
thaJeztah May 11, 2022
0389090
update golang to 1.18.3
thaJeztah Jun 2, 2022
c70b01e
update golang to 1.18.4
thaJeztah Jul 13, 2022
bdac0b3
Update golang to 1.18.5
thaJeztah Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "GO_VERSION" {
default = "1.17.13"
default = "1.18.5"
}
variable "VERSION" {
default = ""
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.binary-native
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.17.13
ARG GO_VERSION=1.18.5

FROM golang:${GO_VERSION}-alpine

Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions dockerfiles/Dockerfile.lint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down