Skip to content

[Needs carry for Linux fixes] Windows: Update to latest OCI runtime spec#33336

Closed
lowenna wants to merge 2 commits intomoby:masterfrom
microsoft:jjh/ocispec-movecredentialspec
Closed

[Needs carry for Linux fixes] Windows: Update to latest OCI runtime spec#33336
lowenna wants to merge 2 commits intomoby:masterfrom
microsoft:jjh/ocispec-movecredentialspec

Conversation

@lowenna
Copy link
Copy Markdown
Member

@lowenna lowenna commented May 22, 2017

Updates to the latest OCI runtime spec, moving all out-of-band fields to using the spec version.

Signed-off-by: John Howard [email protected]

@lowenna lowenna changed the title Windows: Update to latest OCI runtime spec [WIP] Windows: Update to latest OCI runtime spec May 22, 2017
@lowenna
Copy link
Copy Markdown
Member Author

lowenna commented May 22, 2017

Ugh, the process spec has changed too. Need to fix up Linux.

@lowenna lowenna force-pushed the jjh/ocispec-movecredentialspec branch 2 times, most recently from 368881b to 44478b7 Compare May 22, 2017 19:29
@lowenna
Copy link
Copy Markdown
Member Author

lowenna commented May 22, 2017

@mlaventure @crosbymichael @tianon Could one of you help me find where what was vendored from containerd\containerd\runtime has moved to? It was removed from containerd\containerd via commit e115b52ce2516ead331522c965fab93b62d4041e back in November last year, and this is causing all the Linux compilation issues..

Or does someone else have a moby\moby branch in progress to update the docker engine to the latest spec?

@mlaventure
Copy link
Copy Markdown
Contributor

@jhowardmsft that type is just an alias for the oci spec Process type. The version vendored in by containerd needs to be updated to use a compatible version of the one you're putting here.

John Howard added 2 commits May 30, 2017 16:13
This commit updates to the latest OCI runtime spec. In the process, it moves all
"out-of-band" options used by Windows to use fields that are now in the official spec.
Specifically: Servicing; Flush; Hyper-V, Layer, Network Endpoints and CredentialSpec.

It also caters for the other two changes in the OCI spec, specifically both `Box` and `Process`
changing to pointers rather than inline structures.

Signed-off-by: John Howard <[email protected]>
@lowenna lowenna force-pushed the jjh/ocispec-movecredentialspec branch from 44478b7 to 79bc3da Compare May 30, 2017 23:20
@lowenna lowenna changed the title [WIP] Windows: Update to latest OCI runtime spec [Needs carry for Linux fixes] Windows: Update to latest OCI runtime spec Jun 1, 2017
@mlaventure mlaventure self-assigned this Jun 1, 2017
@thaJeztah
Copy link
Copy Markdown
Member

ping @mlaventure what's the status on this one?

@darstahl
Copy link
Copy Markdown
Contributor

This looks to be fairly out of date now. There have been more OCI changes that will be needed prior to the containerd execution integration for Windows.

I can open a more up-to-date OCI runtime-spec update for Windows if someone is willing to commit to carrying it and adding the Linux changes required.

@thaJeztah
Copy link
Copy Markdown
Member

@crosbymichael you're able to assist?

@mlaventure
Copy link
Copy Markdown
Contributor

@darrenstahlmsft I have a PR open to update the specs to the last version used by thev0.2.x branch: #34356

Would that be enough for you?

I've tried to rebase this branch on top of that, but for some of the changes, I'm not sure how to adapt them correctly for LCOW

@darstahl
Copy link
Copy Markdown
Contributor

darstahl commented Aug 1, 2017

So much has changed since this PR, I've got a new version I'm working on. I should have it ready by EOD. I'll ping you when it's ready.

@lowenna
Copy link
Copy Markdown
Member Author

lowenna commented Aug 3, 2017

Closing this as @darrenstahlmsft has a more up to date version

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants