diff --git a/daemon/graphdriver/lcow/lcow.go b/daemon/graphdriver/lcow/lcow.go index b5050687675dd..86beb3d5f0af1 100644 --- a/daemon/graphdriver/lcow/lcow.go +++ b/daemon/graphdriver/lcow/lcow.go @@ -68,12 +68,12 @@ import ( "time" "github.com/Microsoft/hcsshim" + "github.com/Microsoft/opengcs/client" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/system" - "github.com/jhowardmsft/opengcs/gogcs/client" "github.com/sirupsen/logrus" ) diff --git a/daemon/start_windows.go b/daemon/start_windows.go index fe8fc0e5f31ff..098380d00b13b 100644 --- a/daemon/start_windows.go +++ b/daemon/start_windows.go @@ -6,10 +6,10 @@ import ( "path/filepath" "strings" + "github.com/Microsoft/opengcs/client" "github.com/docker/docker/container" "github.com/docker/docker/layer" "github.com/docker/docker/libcontainerd" - "github.com/jhowardmsft/opengcs/gogcs/client" "golang.org/x/sys/windows/registry" ) diff --git a/libcontainerd/client_windows.go b/libcontainerd/client_windows.go index 3c17803615e74..db84061254e9f 100644 --- a/libcontainerd/client_windows.go +++ b/libcontainerd/client_windows.go @@ -15,9 +15,9 @@ import ( "golang.org/x/net/context" "github.com/Microsoft/hcsshim" + opengcs "github.com/Microsoft/opengcs/client" "github.com/docker/docker/pkg/sysinfo" "github.com/docker/docker/pkg/system" - opengcs "github.com/jhowardmsft/opengcs/gogcs/client" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/libcontainerd/types_windows.go b/libcontainerd/types_windows.go index 817a3321450fb..1ffe0f40aaa1c 100644 --- a/libcontainerd/types_windows.go +++ b/libcontainerd/types_windows.go @@ -2,7 +2,7 @@ package libcontainerd import ( "github.com/Microsoft/hcsshim" - opengcs "github.com/jhowardmsft/opengcs/gogcs/client" + opengcs "github.com/Microsoft/opengcs/client" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/vendor.conf b/vendor.conf index 7608b0e337037..95ef7c634844a 100644 --- a/vendor.conf +++ b/vendor.conf @@ -8,7 +8,7 @@ github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git github.com/gorilla/context v1.1 github.com/gorilla/mux v1.1 -github.com/jhowardmsft/opengcs v0.0.12 +github.com/Microsoft/opengcs v0.3.2 github.com/kr/pty 5cf931ef8f github.com/mattn/go-shellwords v1.0.3 github.com/sirupsen/logrus v1.0.1 diff --git a/vendor/github.com/Microsoft/opengcs/LICENSE b/vendor/github.com/Microsoft/opengcs/LICENSE new file mode 100644 index 0000000000000..4b1ad51b2f0ef --- /dev/null +++ b/vendor/github.com/Microsoft/opengcs/LICENSE @@ -0,0 +1,21 @@ + MIT License + + Copyright (c) Microsoft Corporation. All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE diff --git a/vendor/github.com/Microsoft/opengcs/README.md b/vendor/github.com/Microsoft/opengcs/README.md new file mode 100644 index 0000000000000..e931fde8f3e8e --- /dev/null +++ b/vendor/github.com/Microsoft/opengcs/README.md @@ -0,0 +1,14 @@ + +# Open Guest Compute Service (opengcs) [![Build Status](https://travis-ci.org/Microsoft/opengcs.svg?branch=master)](https://travis-ci.org/Microsoft/opengcs) + +Open Guest Compute Service is a Linux open source project to further the development of a production quality implementation of Linux Hyper-V container on Windows (LCOW). It's designed to run inside a custom Linux OS for supporting Linux container payload. + +# Getting Started + + [How to build GCS binaries](./docs/gcsbuildinstructions.md/) + + [How to build custom Linux OS images](./docs/customosbuildinstructions.md/) + +# Contributing + +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/config.go b/vendor/github.com/Microsoft/opengcs/client/config.go similarity index 98% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/config.go rename to vendor/github.com/Microsoft/opengcs/client/config.go index 141b77f2004bf..12119574a307e 100644 --- a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/config.go +++ b/vendor/github.com/Microsoft/opengcs/client/config.go @@ -157,6 +157,9 @@ func (config *Config) GenerateDefault(options []string) error { // Last priority is the default timeout config.UvmTimeoutSeconds = defaultUvmTimeoutSeconds + // Set the default requested mode + config.RequestedMode = ModeRequestAuto + return nil } @@ -237,7 +240,9 @@ func (config *Config) StartUtilityVM() error { if config.ActualMode == ModeActualVhdx { configuration.HvRuntime = &hcsshim.HvRuntime{ - ImagePath: config.Vhdx, + ImagePath: config.Vhdx, + BootSource: "Vhd", + WritableBootSource: true, } } else { configuration.HvRuntime = &hcsshim.HvRuntime{ diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/createext4vhdx.go b/vendor/github.com/Microsoft/opengcs/client/createext4vhdx.go similarity index 100% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/createext4vhdx.go rename to vendor/github.com/Microsoft/opengcs/client/createext4vhdx.go diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotaddvhd.go b/vendor/github.com/Microsoft/opengcs/client/hotaddvhd.go similarity index 100% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotaddvhd.go rename to vendor/github.com/Microsoft/opengcs/client/hotaddvhd.go diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotremovevhd.go b/vendor/github.com/Microsoft/opengcs/client/hotremovevhd.go similarity index 100% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotremovevhd.go rename to vendor/github.com/Microsoft/opengcs/client/hotremovevhd.go diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/layervhddetails.go b/vendor/github.com/Microsoft/opengcs/client/layervhddetails.go similarity index 100% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/layervhddetails.go rename to vendor/github.com/Microsoft/opengcs/client/layervhddetails.go diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/process.go b/vendor/github.com/Microsoft/opengcs/client/process.go similarity index 100% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/process.go rename to vendor/github.com/Microsoft/opengcs/client/process.go diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/tartovhd.go b/vendor/github.com/Microsoft/opengcs/client/tartovhd.go similarity index 100% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/tartovhd.go rename to vendor/github.com/Microsoft/opengcs/client/tartovhd.go diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/unsupported.go b/vendor/github.com/Microsoft/opengcs/client/unsupported.go similarity index 100% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/unsupported.go rename to vendor/github.com/Microsoft/opengcs/client/unsupported.go diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/utilities.go b/vendor/github.com/Microsoft/opengcs/client/utilities.go similarity index 100% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/utilities.go rename to vendor/github.com/Microsoft/opengcs/client/utilities.go diff --git a/vendor/github.com/jhowardmsft/opengcs/gogcs/client/vhdtotar.go b/vendor/github.com/Microsoft/opengcs/client/vhdtotar.go similarity index 100% rename from vendor/github.com/jhowardmsft/opengcs/gogcs/client/vhdtotar.go rename to vendor/github.com/Microsoft/opengcs/client/vhdtotar.go diff --git a/vendor/github.com/jhowardmsft/opengcs/LICENSE b/vendor/github.com/jhowardmsft/opengcs/LICENSE deleted file mode 100644 index 8739a025ea36f..0000000000000 --- a/vendor/github.com/jhowardmsft/opengcs/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file