1. docker
  2. Commit 9983a7b88f24b4cebdda1cfb1d5dd20fdd50820f
Browse code

Revendor Microsoft\hcsshim to v0.5.12

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

John Howard authored on 2017/02/16 02:53:38
Showing 3 changed files
vendor.conf
History View file @ 9983a7b
... ... 
@@ -1,6 +1,6 @@
1 1 
 # the following lines are in sorted order, FYI
2 2 
 github.com/Azure/go-ansiterm 388960b655244e76e24c75f48631564eaefade62
3 
-github.com/Microsoft/hcsshim v0.5.10
3 
+github.com/Microsoft/hcsshim v0.5.12
4 4 
 github.com/Microsoft/go-winio v0.3.8
5 5 
 github.com/Sirupsen/logrus v0.11.0
6 6 
 github.com/davecgh/go-spew 6d212800a42e8ab5c146b8ace3490ee17e5225f9
vendor/github.com/Microsoft/hcsshim/errors.go
History View file @ 9983a7b
... ... 
@@ -50,6 +50,10 @@ var (
50 50
51 51 
 	// ErrProcNotFound is an error encountered when the the process cannot be found
52 52 
 	ErrProcNotFound = syscall.Errno(0x7f)
53 
+
54 
+	// ErrVmcomputeOperationAccessIsDenied is an error which can be encountered when enumerating compute systems in RS1/RS2
55 
+	// builds when the underlying silo might be in the process of terminating. HCS was fixed in RS3.
56 
+	ErrVmcomputeOperationAccessIsDenied = syscall.Errno(0x5)
53 57 
 )
54 58
55 59 
 // ProcessError is an error encountered in HCS during an operation on a Process object
vendor/github.com/Microsoft/hcsshim/interface.go
History View file @ 9983a7b
... ... 
@@ -41,31 +41,32 @@ type HvRuntime struct {
41 41 
 // ContainerConfig is used as both the input of CreateContainer
42 42 
 // and to convert the parameters to JSON for passing onto the HCS
43 43 
 type ContainerConfig struct {
44 
-	SystemType               string      // HCS requires this to be hard-coded to "Container"
45 
-	Name                     string      // Name of the container. We use the docker ID.
46 
-	Owner                    string      // The management platform that created this container
47 
-	IsDummy                  bool        // Used for development purposes.
48 
-	VolumePath               string      `json:",omitempty"` // Windows volume path for scratch space. Used by Windows Server Containers only. Format \\?\\Volume{GUID}
49 
-	IgnoreFlushesDuringBoot  bool        // Optimization hint for container startup in Windows
50 
-	LayerFolderPath          string      `json:",omitempty"` // Where the layer folders are located. Used by Windows Server Containers only. Format  %root%\windowsfilter\containerID
51 
-	Layers                   []Layer     // List of storage layers. Required for Windows Server and Hyper-V Containers. Format ID=GUID;Path=%root%\windowsfilter\layerID
52 
-	Credentials              string      `json:",omitempty"` // Credentials information
53 
-	ProcessorCount           uint32      `json:",omitempty"` // Number of processors to assign to the container.
54 
-	ProcessorWeight          uint64      `json:",omitempty"` // CPU Shares 0..10000 on Windows; where 0 will be omitted and HCS will default.
55 
-	ProcessorMaximum         int64       `json:",omitempty"` // CPU maximum usage percent 1..100
56 
-	StorageIOPSMaximum       uint64      `json:",omitempty"` // Maximum Storage IOPS
57 
-	StorageBandwidthMaximum  uint64      `json:",omitempty"` // Maximum Storage Bandwidth in bytes per second
58 
-	StorageSandboxSize       uint64      `json:",omitempty"` // Size in bytes that the container system drive should be expanded to if smaller
59 
-	MemoryMaximumInMB        int64       `json:",omitempty"` // Maximum memory available to the container in Megabytes
60 
-	HostName                 string      // Hostname
61 
-	MappedDirectories        []MappedDir // List of mapped directories (volumes/mounts)
62 
-	SandboxPath              string      `json:",omitempty"` // Location of unmounted sandbox. Used by Hyper-V containers only. Format %root%\windowsfilter
63 
-	HvPartition              bool        // True if it a Hyper-V Container
64 
-	EndpointList             []string    // List of networking endpoints to be attached to container
65 
-	HvRuntime                *HvRuntime  `json:",omitempty"` // Hyper-V container settings. Used by Hyper-V containers only. Format ImagePath=%root%\BaseLayerID\UtilityVM
66 
-	Servicing                bool        // True if this container is for servicing
67 
-	AllowUnqualifiedDNSQuery bool        // True to allow unqualified DNS name resolution
68 
-	DNSSearchList            string      `json:",omitempty"` // Comma seperated list of DNS suffixes to use for name resolution
44 
+	SystemType                 string      // HCS requires this to be hard-coded to "Container"
45 
+	Name                       string      // Name of the container. We use the docker ID.
46 
+	Owner                      string      // The management platform that created this container
47 
+	IsDummy                    bool        // Used for development purposes.
48 
+	VolumePath                 string      `json:",omitempty"` // Windows volume path for scratch space. Used by Windows Server Containers only. Format \\?\\Volume{GUID}
49 
+	IgnoreFlushesDuringBoot    bool        // Optimization hint for container startup in Windows
50 
+	LayerFolderPath            string      `json:",omitempty"` // Where the layer folders are located. Used by Windows Server Containers only. Format  %root%\windowsfilter\containerID
51 
+	Layers                     []Layer     // List of storage layers. Required for Windows Server and Hyper-V Containers. Format ID=GUID;Path=%root%\windowsfilter\layerID
52 
+	Credentials                string      `json:",omitempty"` // Credentials information
53 
+	ProcessorCount             uint32      `json:",omitempty"` // Number of processors to assign to the container.
54 
+	ProcessorWeight            uint64      `json:",omitempty"` // CPU Shares 0..10000 on Windows; where 0 will be omitted and HCS will default.
55 
+	ProcessorMaximum           int64       `json:",omitempty"` // CPU maximum usage percent 1..100
56 
+	StorageIOPSMaximum         uint64      `json:",omitempty"` // Maximum Storage IOPS
57 
+	StorageBandwidthMaximum    uint64      `json:",omitempty"` // Maximum Storage Bandwidth in bytes per second
58 
+	StorageSandboxSize         uint64      `json:",omitempty"` // Size in bytes that the container system drive should be expanded to if smaller
59 
+	MemoryMaximumInMB          int64       `json:",omitempty"` // Maximum memory available to the container in Megabytes
60 
+	HostName                   string      // Hostname
61 
+	MappedDirectories          []MappedDir // List of mapped directories (volumes/mounts)
62 
+	SandboxPath                string      `json:",omitempty"` // Location of unmounted sandbox. Used by Hyper-V containers only. Format %root%\windowsfilter
63 
+	HvPartition                bool        // True if it a Hyper-V Container
64 
+	EndpointList               []string    // List of networking endpoints to be attached to container
65 
+	NetworkSharedContainerName string      `json:",omitempty"` // Name (ID) of the container that we will share the network stack with.
66 
+	HvRuntime                  *HvRuntime  `json:",omitempty"` // Hyper-V container settings. Used by Hyper-V containers only. Format ImagePath=%root%\BaseLayerID\UtilityVM
67 
+	Servicing                  bool        // True if this container is for servicing
68 
+	AllowUnqualifiedDNSQuery   bool        // True to allow unqualified DNS name resolution
69 
+	DNSSearchList              string      `json:",omitempty"` // Comma seperated list of DNS suffixes to use for name resolution
69 70 
 }
70 71
71 72 
 type ComputeSystemQuery struct {