Skip to content

[release/1.5] Backport build updates#5474

Merged
AkihiroSuda merged 2 commits intocontainerd:release/1.5from
dmcgowan:1.5-cherry-pick-build-updates
May 10, 2021
Merged

[release/1.5] Backport build updates#5474
AkihiroSuda merged 2 commits intocontainerd:release/1.5from
dmcgowan:1.5-cherry-pick-build-updates

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented May 10, 2021

Backports build updates from #5450 #5461

metux and others added 2 commits May 10, 2021 09:27
This is required for environments/build systems where a specific
go version / command needs to be used.

Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]>
(cherry picked from commit 9ea2563)
Signed-off-by: Derek McGowan <[email protected]>
fix [#45710](golang/go#45710) and CVE-2021-31525.

Signed-off-by: Jintao Zhang <[email protected]>
(cherry picked from commit 79d800b)
Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan force-pushed the 1.5-cherry-pick-build-updates branch from 5378903 to 3a86110 Compare May 10, 2021 16:27
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@AkihiroSuda AkihiroSuda merged commit 423cd40 into containerd:release/1.5 May 10, 2021
@dmcgowan dmcgowan deleted the 1.5-cherry-pick-build-updates branch April 20, 2024 00:27
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.

5 participants