Skip to content

Commit

Permalink
Merge pull request #3773 from thaJeztah/20.10_backport_bump_golang_1.…
Browse files Browse the repository at this point in the history
…18.6

[20.10 backport] Update to go 1.18.6 to address CVE-2022-27664, CVE-2022-32190
  • Loading branch information
thaJeztah committed Sep 8, 2022
2 parents bd04f19 + 93eead4 commit b40c2f6
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.18.5
ARG GO_VERSION=1.18.6
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
Expand Up @@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli

environment:
GOPATH: c:\gopath
GOVERSION: 1.18.5
GOVERSION: 1.18.6
DEPVERSION: v0.4.1

install:
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
@@ -1,5 +1,5 @@
variable "GO_VERSION" {
default = "1.18.5"
default = "1.18.6"
}
variable "VERSION" {
default = ""
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.binary-native
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.18.5
ARG GO_VERSION=1.18.6

FROM golang:${GO_VERSION}-alpine

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.dev
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.18.5
ARG GO_VERSION=1.18.6

FROM golang:${GO_VERSION}-alpine AS golang
ENV CGO_ENABLED=0
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.e2e
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.18.5
ARG GO_VERSION=1.18.6

# Use Debian based image as docker-compose requires glibc.
FROM golang:${GO_VERSION}-buster
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.lint
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.18.5
ARG GO_VERSION=1.18.6
ARG GOLANGCI_LINT_VERSION=v1.45.2

FROM golang:${GO_VERSION}-alpine AS build
Expand Down

0 comments on commit b40c2f6

Please sign in to comment.