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.

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

[18.09] bump golang 1.11.12 #364

Merged
merged 6 commits into from
Aug 6, 2019

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 8, 2019

depends on:

thaJeztah added 4 commits July 8, 2019 11:31
This reverts commit 9aec277.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
go1.11.3 (released 2018/12/14)

- crypto/x509: CPU denial of service in chain validation golang/go#29233
- cmd/go: directory traversal in "go get" via curly braces in import paths golang/go#29231
- cmd/go: remote command execution during "go get -u" golang/go#29230

See the Go 1.11.3 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.11.3

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 517a30b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.11.5+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit a86dd09)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
go1.11.11 (released 2019/06/11) includes a fix to the crypto/x509 package.
See the Go 1.11.11 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.11

Signed-off-by: Sebastiaan van Stijn <[email protected]>
kolyshkin
kolyshkin previously approved these changes Jul 23, 2019
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah changed the title [WIP][18.09] bump golang 1.11.11 [18.09] bump golang 1.11.11 Jul 23, 2019
@thaJeztah
Copy link
Member Author

removed "WIP" because engine/cli have been merged

ping @seemethere ptal

@kolyshkin
Copy link
Contributor

this needs to be updated to 1.11.12 and now depends on two more PRs:
docker/cli#2015 and docker-archive/engine#302

go1.11.12 (released 2019/07/08) includes fixes to the compiler and the linker.
See the Go 1.11.12 milestone on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.11.12

Full diff: golang/go@go1.11.11...go1.11.12

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin kolyshkin changed the title [18.09] bump golang 1.11.11 [18.09] bump golang 1.11.12 Jul 24, 2019
@kolyshkin kolyshkin modified the milestones: 18.09.8, 18.09.9 Jul 26, 2019
@thaJeztah
Copy link
Member Author

CI is failing, likely because the Golang image switched to buster;

E: Unable to locate package libgcc-6-dev

@thaJeztah
Copy link
Member Author

cherry-picked #369 Pin Golang images to debian stretch variant

@thaJeztah
Copy link
Member Author

Actually; not sure we need to pin to the stretch variant, because we only copy the go binaries from the image 🤔

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 1310e39)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 18.09_bump_golang_1.11.11 branch from 7f0965c to 32cdb89 Compare August 6, 2019 21:37
@thaJeztah
Copy link
Member Author

oh, never mind; we do use the golang image for the image variant;

FROM ${GO_IMAGE} as builder
COPY hack/dockerfile/install/tini.installer /
COPY hack/dockerfile/install/proxy.installer /
RUN apt-get update && apt-get install -y \
bash \
btrfs-tools \
ca-certificates \
cmake \
gcc \
git \
libc-dev \
libgcc-6-dev \

Copy link
Contributor

@seemethere seemethere left a comment

Choose a reason for hiding this comment

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

Just like I said in #369 this is a fine intermediary step while we figure out the changes necessary to move to the buster versions of these images.

LGTM for now.

@seemethere seemethere merged commit 4ff2844 into docker:18.09 Aug 6, 2019
@thaJeztah thaJeztah deleted the 18.09_bump_golang_1.11.11 branch August 6, 2019 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants