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

[release/1.3] backport: Add back default UNIX env to container config#1282

Merged
Random-Liu merged 2 commits intocontainerd:release/1.3from
estesp:cp-1280
Sep 19, 2019
Merged

[release/1.3] backport: Add back default UNIX env to container config#1282
Random-Liu merged 2 commits intocontainerd:release/1.3from
estesp:cp-1280

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Sep 19, 2019

Cherry-pick/backport #1280; required re-vendoring containerd/containerd and dependent repos to get the helper for default path env.

Update cri release/1.3 branch to recent containerd 1.3.0-rc era to get the
oci.WithDefaultPathEnv helper.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Copy link
Copy Markdown
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

@Random-Liu
Copy link
Copy Markdown
Member

/lgtm

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.

4 participants