Skip to content

bugfix: override image.Env with process.Env, rather than be contrary#3542

Merged
estesp merged 1 commit intocontainerd:masterfrom
1032120121:upstream_master
Aug 16, 2019
Merged

bugfix: override image.Env with process.Env, rather than be contrary#3542
estesp merged 1 commit intocontainerd:masterfrom
1032120121:upstream_master

Conversation

@1032120121
Copy link
Contributor

the Env in image should be default value, it should has override by the Env in process. otherwise the Env in image is immutable, setting the Env in process will be meaningless

@theopenlab-ci
Copy link

theopenlab-ci bot commented Aug 16, 2019

Build succeeded.

Signed-off-by: Yangyang <1032120121@163.com>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Aug 16, 2019

Build succeeded.

@crosbymichael
Copy link
Member

LGTM

logic looks correct to me

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 60439ae into containerd:master Aug 16, 2019
crosbymichael added a commit to crosbymichael/containerd that referenced this pull request Aug 19, 2019
With the change in containerd#3542 it breaks $PATH handling for images becuase our
default spec always sets a PATH on the process's .Env.

This removes the default and adds an Opt to add this back.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
estesp pushed a commit to estesp/containerd that referenced this pull request Aug 20, 2019
With the change in containerd#3542 it breaks $PATH handling for images becuase our
default spec always sets a PATH on the process's .Env.

This removes the default and adds an Opt to add this back.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
tussennet pushed a commit to tussennet/containerd that referenced this pull request Sep 11, 2020
With the change in containerd#3542 it breaks $PATH handling for images becuase our
default spec always sets a PATH on the process's .Env.

This removes the default and adds an Opt to add this back.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
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