Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

[release/1.3] cri: append envs from image config to empty slice to avoid env lost #1629

Merged
merged 1 commit into from
Mar 3, 2021

Conversation

fuweid
Copy link
Member

@fuweid fuweid commented Mar 3, 2021

(cherry picked from commit containerd/containerd@08318b1)

Signed-off-by: Yadong Zhang yadzhang@gmail.com
Signed-off-by: Wei Fu fuweid89@gmail.com

(cherry picked from commit containerd/containerd@08318b1)

Signed-off-by: Yadong Zhang <yadzhang@gmail.com>
Signed-off-by: Wei Fu <fuweid89@gmail.com>
@fuweid
Copy link
Member Author

fuweid commented Mar 3, 2021

/ok-to-test

Copy link
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

@estesp estesp merged commit ca9c553 into containerd:release/1.3 Mar 3, 2021
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid deleted the cherry-pick-cri-1628 branch March 4, 2021 02:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants