New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LCOW: Updates necessary due to platform schema change #33785

Merged
merged 3 commits into from Jun 23, 2017

Conversation

Projects
None yet
5 participants
@jhowardmsft
Contributor

jhowardmsft commented Jun 22, 2017

Signed-off-by: John Howard jhoward@microsoft.com

The HCS API in the platform has just been updated. This revendors HCSShim and opengcs with the updated schema, and updates libcontainerd in docker to match. Manually verified internally (there are no public builds which are available)

@johnstep

LCOW: Update for platforms latest schema
Signed-off-by: John Howard <jhoward@microsoft.com>
@jstarks

This comment has been minimized.

Show comment
Hide comment
@jstarks

jstarks Jun 23, 2017

Contributor

Misspelling in commit title for 0e1b453...

Contributor

jstarks commented Jun 23, 2017

Misspelling in commit title for 0e1b453...

@jhowardmsft

This comment has been minimized.

Show comment
Hide comment
@jhowardmsft

jhowardmsft Jun 23, 2017

Contributor

Ugh. Yes, I'll fix it. Or just change my GitHub username. Which ever is quicker... 😂

Contributor

jhowardmsft commented Jun 23, 2017

Ugh. Yes, I'll fix it. Or just change my GitHub username. Which ever is quicker... 😂

jhowardmsft added some commits Jun 22, 2017

Vendor Microsoft/hcsshim v0.5.25
Signed-off-by: John Howard <jhoward@microsoft.com>
Vendor jhowardmsft/opengcs v0.0.4
Signed-off-by: John Howard <jhoward@microsoft.com>
@jhowardmsft

This comment has been minimized.

Show comment
Hide comment
@jhowardmsft

jhowardmsft Jun 23, 2017

Contributor

Turns out fixing the typo in the commit title was easier than changing usernames. Fixed

Contributor

jhowardmsft commented Jun 23, 2017

Turns out fixing the typo in the commit title was easier than changing usernames. Fixed

@jhowardmsft

This comment has been minimized.

Show comment
Hide comment
@jhowardmsft

jhowardmsft Jun 23, 2017

Contributor

@thaJeztah @vdemeester PTAL. Thanks!

Contributor

jhowardmsft commented Jun 23, 2017

@thaJeztah @vdemeester PTAL. Thanks!

@vdemeester

LGTM 🐸

Kernel string // Kernel for Utility VM (embedded in a UEFI bootloader)
Initrd string // Initrd image for Utility VM
Vhdx string // VHD for booting the utility VM
KirdPath string // Path to where kernel/initrd are found (defaults to c:\program files\lcow)

This comment has been minimized.

@johnstep

johnstep Jun 23, 2017

Contributor

Weird name, kird, but seems okay.

@johnstep

johnstep Jun 23, 2017

Contributor

Weird name, kird, but seems okay.

@@ -299,7 +299,9 @@ func (clnt *client) createLinux(containerID string, checkpoint string, checkpoin
Owner: defaultOwner,
TerminateOnLastHandleClosed: true,
HvRuntime: &hcsshim.HvRuntime{
ImagePath: `c:\program files\lcow`,
ImagePath: `c:\program files\lcow`,

This comment has been minimized.

@johnstep

johnstep Jun 23, 2017

Contributor

While not a change in this commit, does it make sense to use the ProgramFiles environment variable instead of hard-coding, in the rare case it is something other than C:\ProgramFiles on the host?

@johnstep

johnstep Jun 23, 2017

Contributor

While not a change in this commit, does it make sense to use the ProgramFiles environment variable instead of hard-coding, in the rare case it is something other than C:\ProgramFiles on the host?

@johnstep

LGTM

@jhowardmsft jhowardmsft merged commit 25a65a1 into moby:master Jun 23, 2017

7 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 35230 has succeeded
Details
janky Jenkins build Docker-PRs 43836 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 4204 has succeeded
Details
vendor Jenkins build Docker-PRs-vendor 3554 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 15172 has succeeded
Details
z Jenkins build Docker-PRs-s390x 3932 has succeeded
Details

@jhowardmsft jhowardmsft deleted the Microsoft:jjh/hcsschemaupdate branch Jun 23, 2017

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