Skip to content

Runtime v2 absolute shim path to executable#2514

Merged
dmcgowan merged 1 commit intocontainerd:masterfrom
jterry75:runtime_v2_shim_command
Jul 31, 2018
Merged

Runtime v2 absolute shim path to executable#2514
dmcgowan merged 1 commit intocontainerd:masterfrom
jterry75:runtime_v2_shim_command

Conversation

@jterry75
Copy link
Copy Markdown
Contributor

Fixes an issue where the runtime v2 was not using an absolute path to
the executable but setting the .Dir field on the exec.Cmd. This causes
the executable to need to be relative to .Dir but no shim is actually
copied to the bundle directory that its work dir is set to.

Signed-off-by: Justin Terry (VM) [email protected]

Fixes an issue where the runtime v2 was not using an absolute path to
the executable but setting the .Dir field on the exec.Cmd. This causes
the executable to need to be relative to .Dir but no shim is actually
copied to the bundle directory that its work dir is set to.

Signed-off-by: Justin Terry (VM) <[email protected]>
@codecov-io
Copy link
Copy Markdown

codecov-io commented Jul 31, 2018

Codecov Report

Merging #2514 into master will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #2514      +/-   ##
=========================================
+ Coverage   45.07%   45.1%   +0.03%     
=========================================
  Files          93      93              
  Lines        9780    9780              
=========================================
+ Hits         4408    4411       +3     
+ Misses       4654    4652       -2     
+ Partials      718     717       -1
Flag Coverage Δ
#linux 49.1% <ø> (ø) ⬆️
#windows 41.61% <ø> (+0.03%) ⬆️
Impacted Files Coverage Δ
gc/scheduler/scheduler.go 68.75% <0%> (+1.44%) ⬆️

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 875b92c...9f13b74. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

windows not not always return an ABS path on lookup and this is safe to call again on unix.

@dmcgowan
Copy link
Copy Markdown
Member

LGTM

@dmcgowan dmcgowan merged commit 9dc55ea into containerd:master Jul 31, 2018
@jterry75 jterry75 deleted the runtime_v2_shim_command branch August 1, 2018 16:32
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.

4 participants