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

Conversation

@thaJeztah
Copy link
Member

17.12 Backports of:

This PR is based on #402, so needs a rebase after that's merged

git checkout -b 17.12-backport-bump-golang-1.9.4 upstream/17.12
git cherry-pick -s -S -x -Xsubtree=components/engine caeab268430a033fedd27c53be16758ac1a0f71e
git cherry-pick -s -S -x -Xsubtree=components/engine 250193387c98a4ad69a6591d5fe5a39c1409ffba
git cherry-pick -s -S -x -Xsubtree=components/cli b32599761fa7e982d6fe1b41c34383f4167fd060
git cherry-pick -s -S -x -Xsubtree=components/packaging 6263b1254b179af81ff4ef97563fe2e1a053993a

Trivial conflicts due to some files not yet being in the 17.12 branch:

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by us:   components/cli/dockerfiles/Dockerfile.binary-native
Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by us:   components/packaging/rpm/centos-7/Dockerfile.aarch64
	deleted by us:   components/packaging/rpm/fedora-26/Dockerfile.aarch64

This fixes a vulnerability in go get (CVE-2018-6574, http://golang.org/issue/23672),
but shouldn't really affect our code, but it's good to keep in sync.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ffc76483226ee1528cab5cf8ea78c0824272cd58)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
release notes: https://golang.org/doc/devel/release.html#go1.9.minor

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3cc1351)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0e676c4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This fixes a vulnerability in `go get` (CVE-2018-6574, http://golang.org/issue/23672),
but shouldn't really affect our code, but it's good to keep in sync.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit caeab26)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This workaround for golang/go#15286 was added for Nano server TP5 in
fa82c0a, and should no longer be
needed

Due to a security fix in Go 1.9.4/1.8.7, loading the .dll is no longer
allowed, and produces an error:

   .\docker_windows.go:9:3: //go:cgo_import_dynamic main.dummy CommandLineToArgvW%2 "shell32.dll" only allowed in cgo-generated code

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2501933)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This fixes a vulnerability in `go get` (CVE-2018-6574, http://golang.org/issue/23672),
but shouldn't really affect our code, but it's good to keep in sync.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b32599761fa7e982d6fe1b41c34383f4167fd060)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This fixes a vulnerability in `go get` (CVE-2018-6574, http://golang.org/issue/23672),
but shouldn't really affect our code, but it's good to keep in sync.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6263b12)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 17.12.1 milestone Feb 8, 2018
@andrewhsu andrewhsu requested a review from dnephin February 12, 2018 22:53
Copy link
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM w.r.t. rpm conflicts

Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu andrewhsu merged commit c85f7d7 into docker-archive:17.12 Feb 13, 2018
@thaJeztah thaJeztah deleted the 17.12-backport-bump-golang-1.9.4 branch February 13, 2018 07:39
docker-jenkins pushed a commit that referenced this pull request Oct 30, 2019
[19.03] Bump golang 1.12.12
Upstream-commit: ddb60aa6d1ba1d9bfbb655fa1f3c3359f82979aa
Component: engine
docker-jenkins pushed a commit that referenced this pull request Jan 22, 2020
Update Golang 1.12.15
Upstream-commit: fc688cd
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 27, 2020
…ump-golang-1.9.4

[17.12] Bump Golang to 1.9.4
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
…ump-golang-1.9.4

[17.12] Bump Golang to 1.9.4
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants