Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 57d13bf

Browse files
cpuguy83Tibor Vass
authored andcommitted
Merge pull request #40433 from thaJeztah/19.03_bump_golang_1.12.16
[19.03] Update Golang 1.12.16, golang.org/x/crypto (CVE-2020-0601, CVE-2020-7919) Upstream-commit: e686f468f7a1003b520baddca38da13c2419602f Component: engine
2 parents 7cdc0a4 + 2cf45c5 commit 57d13bf

34 files changed

Lines changed: 691 additions & 3617 deletions

components/engine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#
2626

2727
ARG CROSS="false"
28-
ARG GO_VERSION=1.12.15
28+
ARG GO_VERSION=1.12.16
2929
ARG DEBIAN_FRONTEND=noninteractive
3030

3131
FROM golang:${GO_VERSION}-stretch AS base

components/engine/Dockerfile.e2e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.12.15
1+
ARG GO_VERSION=1.12.16
22

33
FROM golang:${GO_VERSION}-alpine AS base
44

components/engine/Dockerfile.simple

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# This represents the bare minimum required to build and test Docker.
77

8-
ARG GO_VERSION=1.12.15
8+
ARG GO_VERSION=1.12.16
99

1010
FROM golang:${GO_VERSION}-stretch
1111

components/engine/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
165165
# Use PowerShell as the default shell
166166
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
167167

168-
ARG GO_VERSION=1.12.15
168+
ARG GO_VERSION=1.12.16
169169

170170
# Environment variable notes:
171171
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

components/engine/vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ github.com/golang/protobuf aa810b61a9c79d51363740d207bb
134134
github.com/cloudflare/cfssl 5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2
135135
github.com/fernet/fernet-go 1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2
136136
github.com/google/certificate-transparency-go 37a384cd035e722ea46e55029093e26687138edf # v1.0.20
137-
golang.org/x/crypto 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
137+
golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
138138
golang.org/x/time fbb02b2291d28baffd63558aa44b4b56f178d650
139139
github.com/hashicorp/go-memdb cb9a474f84cc5e41b273b20c6927680b2a8776ad
140140
github.com/hashicorp/go-immutable-radix 826af9ccf0feeee615d546d69b11f8e98da8c8f1 git://github.com/tonistiigi/go-immutable-radix.git

components/engine/vendor/golang.org/x/crypto/cryptobyte/asn1.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/engine/vendor/golang.org/x/crypto/cryptobyte/string.go

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/engine/vendor/golang.org/x/crypto/curve25519/const_amd64.h

Lines changed: 0 additions & 8 deletions
This file was deleted.

components/engine/vendor/golang.org/x/crypto/curve25519/const_amd64.s

Lines changed: 0 additions & 20 deletions
This file was deleted.

components/engine/vendor/golang.org/x/crypto/curve25519/cswap_amd64.s

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)