Merges the oci package for Linux and Windows#2592
Merged
estesp merged 1 commit intocontainerd:masterfrom Aug 30, 2018
Merged
Conversation
Contributor
Author
|
@crosbymichael - FYI |
Contributor
Author
|
@crosbymichael - Can you restart CI. I dont see how this is related to my changes at all. But could be a real bug in the content manager |
mlaventure
reviewed
Aug 29, 2018
Contributor
mlaventure
left a comment
There was a problem hiding this comment.
I think you commited oci.test.exe by mistake.
Codecov Report
@@ Coverage Diff @@
## master #2592 +/- ##
==========================================
- Coverage 44.05% 44.03% -0.03%
==========================================
Files 98 94 -4
Lines 10130 10235 +105
==========================================
+ Hits 4463 4507 +44
- Misses 4945 5008 +63
+ Partials 722 720 -2
Continue to review full report at Codecov.
|
On Windows we need to be able to create both Linux and Windows OCI spec files by default to support WCOW and LCOW scenarios. This merges the compile time differences into runtime differences between the two based on the spec and platform the user sets. It maintains the old behavior with Default specs resulting in the platform default the binary is compiled for. Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
955b226 to
c818a6b
Compare
Member
|
LGTM |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On Windows we need to be able to create both Linux and Windows OCI spec
files by default to support WCOW and LCOW scenarios. This merges the
compile time differences into runtime differences between the two based
on the spec and platform the user sets.
It maintains the old behavior with Default specs resulting in the
platform default the binary is compiled for.
Signed-off-by: Justin Terry (VM) juterry@microsoft.com