Skip to content

[release/1.2] cherry-pick: Remove the process default ENV#3565

Merged
fuweid merged 1 commit intocontainerd:release/1.2from
estesp:cp-3551
Aug 21, 2019
Merged

[release/1.2] cherry-pick: Remove the process default ENV#3565
fuweid merged 1 commit intocontainerd:release/1.2from
estesp:cp-3551

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Aug 20, 2019

With the change in #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 [email protected]
Signed-off-by: Phil Estes [email protected]

Cherry-pick of #3551

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 <[email protected]>
Signed-off-by: Phil Estes <[email protected]>
@estesp estesp added this to the 1.2.8 milestone Aug 21, 2019
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3565 into release/1.2 will decrease coverage by 3%.
The diff coverage is 0%.

Impacted file tree graph

@@              Coverage Diff               @@
##           release/1.2   #3565      +/-   ##
==============================================
- Coverage        44.11%   41.1%   -3.01%     
==============================================
  Files              100      70      -30     
  Lines            10788    9480    -1308     
==============================================
- Hits              4759    3897     -862     
+ Misses            5290    5019     -271     
+ Partials           739     564     -175
Flag Coverage Δ
#linux ?
#windows 41.1% <0%> (-0.02%) ⬇️
Impacted Files Coverage Δ
oci/spec.go 93.68% <ø> (-0.04%) ⬇️
oci/spec_opts.go 25.3% <0%> (-0.38%) ⬇️
snapshots/native/native.go 1.78% <0%> (-41.52%) ⬇️
archive/tar.go 16.99% <0%> (-26.8%) ⬇️
metadata/snapshot.go 21.53% <0%> (-24.28%) ⬇️
content/local/writer.go 57.69% <0%> (-0.97%) ⬇️
gc/scheduler/scheduler.go 66.34% <0%> (-0.97%) ⬇️
mount/temp_unix.go
sys/reaper_linux.go
... and 28 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update de8fa9b...1c309d8. Read the comment docs.

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

Copy link
Copy Markdown
Member

@fuweid fuweid 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 merged commit 5e060c4 into containerd:release/1.2 Aug 21, 2019
@estesp estesp deleted the cp-3551 branch September 19, 2019 03:53
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