Skip to content

Add a Windows section for Linux oci on LCOW#2610

Merged
estesp merged 1 commit intocontainerd:masterfrom
jterry75:fixup_oci_default_lcow
Sep 7, 2018
Merged

Add a Windows section for Linux oci on LCOW#2610
estesp merged 1 commit intocontainerd:masterfrom
jterry75:fixup_oci_default_lcow

Conversation

@jterry75
Copy link
Copy Markdown
Contributor

@jterry75 jterry75 commented Sep 6, 2018

When creating a default OCI spec on Windows that is targeting the LCOW
platform it needs to contain a Windows section as well. This adds the
Windows section by default. It also protects against this case for all
OCI creation that doesnt use the OCI package in the runhcs-shim.

Signed-off-by: Justin Terry (VM) juterry@microsoft.com

When creating a default OCI spec on Windows that is targeting the LCOW
platform it needs to contain a Windows section as well. This adds the
Windows section by default. It also protects against this case for all
OCI creation that doesnt use the OCI package in the runhcs-shim.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2610 into master will increase coverage by 0.04%.
The diff coverage is 68.75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2610      +/-   ##
==========================================
+ Coverage   44.03%   44.07%   +0.04%     
==========================================
  Files          94       94              
  Lines       10235    10232       -3     
==========================================
+ Hits         4507     4510       +3     
+ Misses       5008     5002       -6     
  Partials      720      720
Flag Coverage Δ
#linux 47.8% <53.84%> (+0.29%) ⬆️
#windows 40.72% <68.75%> (+0.05%) ⬆️
Impacted Files Coverage Δ
oci/spec_opts.go 23.77% <50%> (-0.02%) ⬇️
oci/spec.go 93.68% <71.42%> (+0.17%) ⬆️

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 901b2ea...ef91031. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

Copy link
Copy Markdown
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 b5274fe into containerd:master Sep 7, 2018
@jterry75 jterry75 deleted the fixup_oci_default_lcow branch September 7, 2018 16:35
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