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

Commit 68d0178

Browse files
Merge pull request #2302 from thaJeztah/19.03_bump_golang_1.12.16
[19.03 backport] Update Golang 1.12.16, golang.org/x/crypto (CVE-2020-0601, CVE-2020-7919) Upstream-commit: 5908cdf87c249a88c1d7351ee62196ac7e66f6c1 Component: cli
2 parents a2bc745 + 5974a91 commit 68d0178

60 files changed

Lines changed: 3998 additions & 2473 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

components/cli/appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
44

55
environment:
66
GOPATH: c:\gopath
7-
GOVERSION: 1.12.15
7+
GOVERSION: 1.12.16
88
DEPVERSION: v0.4.1
99

1010
install:

components/cli/dockerfiles/Dockerfile.binary-native

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
44

components/cli/dockerfiles/Dockerfile.cross

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 dockercore/golang-cross:${GO_VERSION}
44
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1

components/cli/dockerfiles/Dockerfile.dev

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
44

components/cli/dockerfiles/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
# Use Debian based image as docker-compose requires glibc.
44
FROM golang:${GO_VERSION}

components/cli/dockerfiles/Dockerfile.lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.1.3-experimental
22

3-
ARG GO_VERSION=1.12.15
3+
ARG GO_VERSION=1.12.16
44
ARG GOLANGCI_LINTER_SHA="v1.21.0"
55

66
FROM golang:${GO_VERSION}-alpine AS build

components/cli/vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ github.com/tonistiigi/units 6950e57a87eaf136bbe44ef2ec8e
7979
github.com/xeipuuv/gojsonpointer 4e3ac2762d5f479393488629ee9370b50873b3a6
8080
github.com/xeipuuv/gojsonreference bd5ef7bd5415a7ac448318e64f11a24cd21e594b
8181
github.com/xeipuuv/gojsonschema 93e72a773fade158921402d6a24c819b48aba29d
82-
golang.org/x/crypto 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
82+
golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
8383
golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146
8484
golang.org/x/oauth2 ef147856a6ddbb60760db74283d2424e98c87bff
8585
golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c

components/cli/vendor/golang.org/x/crypto/chacha20/chacha_arm64.go

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

components/cli/vendor/golang.org/x/crypto/internal/chacha20/asm_arm64.s renamed to components/cli/vendor/golang.org/x/crypto/chacha20/chacha_arm64.s

File renamed without changes.

0 commit comments

Comments
 (0)