diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-containers/runc/runc-docker/0001-Update-to-runtime-spec-198f23f827eea397d4331d7eb048d.patch')
| -rw-r--r-- | import-layers/meta-virtualization/recipes-containers/runc/runc-docker/0001-Update-to-runtime-spec-198f23f827eea397d4331d7eb048d.patch | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/import-layers/meta-virtualization/recipes-containers/runc/runc-docker/0001-Update-to-runtime-spec-198f23f827eea397d4331d7eb048d.patch b/import-layers/meta-virtualization/recipes-containers/runc/runc-docker/0001-Update-to-runtime-spec-198f23f827eea397d4331d7eb048d.patch deleted file mode 100644 index bcc76fc4e1..0000000000 --- a/import-layers/meta-virtualization/recipes-containers/runc/runc-docker/0001-Update-to-runtime-spec-198f23f827eea397d4331d7eb048d.patch +++ /dev/null @@ -1,89 +0,0 @@ -From e8ef6025a4f48620baf91737cd37eb5e6a40f48c Mon Sep 17 00:00:00 2001 -From: Justin Cormack <justin.cormack@docker.com> -Date: Fri, 23 Jun 2017 17:14:59 -0700 -Subject: [PATCH 1/3] Update to runtime spec - 198f23f827eea397d4331d7eb048d9d4c7ff7bee - -Updates memory limits to be int64, and removes Platform from spec. - -Signed-off-by: Justin Cormack <justin.cormack@docker.com> ---- - vendor.conf | 2 +- - .../opencontainers/runtime-spec/specs-go/config.go | 23 ++++++---------------- - 2 files changed, 7 insertions(+), 18 deletions(-) - -diff --git a/vendor.conf b/vendor.conf -index e23e7ea7..09a8a924 100644 ---- a/src/import/vendor.conf -+++ b/src/import/vendor.conf -@@ -1,7 +1,7 @@ - # OCI runtime-spec. When updating this, make sure you use a version tag rather - # than a commit ID so it's much more obvious what version of the spec we are - # using. --github.com/opencontainers/runtime-spec 239c4e44f2a612ed85f6db9c66247aa33f437e91 -+github.com/opencontainers/runtime-spec 198f23f827eea397d4331d7eb048d9d4c7ff7bee - # Core libcontainer functionality. - github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08 - github.com/opencontainers/selinux v1.0.0-rc1 -diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go -index 8bf8d924..68ab112e 100644 ---- a/src/import/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go -+++ b/src/import/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go -@@ -6,8 +6,6 @@ import "os" - type Spec struct { - // Version of the Open Container Runtime Specification with which the bundle complies. - Version string `json:"ociVersion"` -- // Platform specifies the configuration's target platform. -- Platform Platform `json:"platform"` - // Process configures the container process. - Process *Process `json:"process,omitempty"` - // Root configures the container's root filesystem. -@@ -101,15 +99,6 @@ type Root struct { - Readonly bool `json:"readonly,omitempty"` - } - --// Platform specifies OS and arch information for the host system that the container --// is created for. --type Platform struct { -- // OS is the operating system. -- OS string `json:"os"` -- // Arch is the architecture -- Arch string `json:"arch"` --} -- - // Mount specifies a mount for a container. - type Mount struct { - // Destination is the absolute path where the mount will be placed in the container. -@@ -284,15 +273,15 @@ type LinuxBlockIO struct { - // LinuxMemory for Linux cgroup 'memory' resource management - type LinuxMemory struct { - // Memory limit (in bytes). -- Limit *uint64 `json:"limit,omitempty"` -+ Limit *int64 `json:"limit,omitempty"` - // Memory reservation or soft_limit (in bytes). -- Reservation *uint64 `json:"reservation,omitempty"` -+ Reservation *int64 `json:"reservation,omitempty"` - // Total memory limit (memory + swap). -- Swap *uint64 `json:"swap,omitempty"` -+ Swap *int64 `json:"swap,omitempty"` - // Kernel memory limit (in bytes). -- Kernel *uint64 `json:"kernel,omitempty"` -+ Kernel *int64 `json:"kernel,omitempty"` - // Kernel memory limit for tcp (in bytes) -- KernelTCP *uint64 `json:"kernelTCP,omitempty"` -+ KernelTCP *int64 `json:"kernelTCP,omitempty"` - // How aggressive the kernel will swap memory pages. - Swappiness *uint64 `json:"swappiness,omitempty"` - } -@@ -486,7 +475,7 @@ type WindowsNetwork struct { - EndpointList []string `json:"endpointList,omitempty"` - // Specifies if unqualified DNS name resolution is allowed. - AllowUnqualifiedDNSQuery bool `json:"allowUnqualifiedDNSQuery,omitempty"` -- // Comma seperated list of DNS suffixes to use for name resolution. -+ // Comma separated list of DNS suffixes to use for name resolution. - DNSSearchList []string `json:"DNSSearchList,omitempty"` - // Name (ID) of the container that we will share with the network stack. - NetworkSharedContainerName string `json:"networkSharedContainerName,omitempty"` --- -2.11.0 - |