| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From e8ef6025a4f48620baf91737cd37eb5e6a40f48c Mon Sep 17 00:00:00 2001 |
| 2 | From: Justin Cormack <justin.cormack@docker.com> |
| 3 | Date: Fri, 23 Jun 2017 17:14:59 -0700 |
| 4 | Subject: [PATCH 1/3] Update to runtime spec |
| 5 | 198f23f827eea397d4331d7eb048d9d4c7ff7bee |
| 6 | |
| 7 | Updates memory limits to be int64, and removes Platform from spec. |
| 8 | |
| 9 | Signed-off-by: Justin Cormack <justin.cormack@docker.com> |
| 10 | --- |
| 11 | vendor.conf | 2 +- |
| 12 | .../opencontainers/runtime-spec/specs-go/config.go | 23 ++++++---------------- |
| 13 | 2 files changed, 7 insertions(+), 18 deletions(-) |
| 14 | |
| 15 | diff --git a/vendor.conf b/vendor.conf |
| 16 | index e23e7ea7..09a8a924 100644 |
| 17 | --- a/src/import/vendor.conf |
| 18 | +++ b/src/import/vendor.conf |
| 19 | @@ -1,7 +1,7 @@ |
| 20 | # OCI runtime-spec. When updating this, make sure you use a version tag rather |
| 21 | # than a commit ID so it's much more obvious what version of the spec we are |
| 22 | # using. |
| 23 | -github.com/opencontainers/runtime-spec 239c4e44f2a612ed85f6db9c66247aa33f437e91 |
| 24 | +github.com/opencontainers/runtime-spec 198f23f827eea397d4331d7eb048d9d4c7ff7bee |
| 25 | # Core libcontainer functionality. |
| 26 | github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08 |
| 27 | github.com/opencontainers/selinux v1.0.0-rc1 |
| 28 | diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go |
| 29 | index 8bf8d924..68ab112e 100644 |
| 30 | --- a/src/import/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go |
| 31 | +++ b/src/import/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go |
| 32 | @@ -6,8 +6,6 @@ import "os" |
| 33 | type Spec struct { |
| 34 | // Version of the Open Container Runtime Specification with which the bundle complies. |
| 35 | Version string `json:"ociVersion"` |
| 36 | - // Platform specifies the configuration's target platform. |
| 37 | - Platform Platform `json:"platform"` |
| 38 | // Process configures the container process. |
| 39 | Process *Process `json:"process,omitempty"` |
| 40 | // Root configures the container's root filesystem. |
| 41 | @@ -101,15 +99,6 @@ type Root struct { |
| 42 | Readonly bool `json:"readonly,omitempty"` |
| 43 | } |
| 44 | |
| 45 | -// Platform specifies OS and arch information for the host system that the container |
| 46 | -// is created for. |
| 47 | -type Platform struct { |
| 48 | - // OS is the operating system. |
| 49 | - OS string `json:"os"` |
| 50 | - // Arch is the architecture |
| 51 | - Arch string `json:"arch"` |
| 52 | -} |
| 53 | - |
| 54 | // Mount specifies a mount for a container. |
| 55 | type Mount struct { |
| 56 | // Destination is the absolute path where the mount will be placed in the container. |
| 57 | @@ -284,15 +273,15 @@ type LinuxBlockIO struct { |
| 58 | // LinuxMemory for Linux cgroup 'memory' resource management |
| 59 | type LinuxMemory struct { |
| 60 | // Memory limit (in bytes). |
| 61 | - Limit *uint64 `json:"limit,omitempty"` |
| 62 | + Limit *int64 `json:"limit,omitempty"` |
| 63 | // Memory reservation or soft_limit (in bytes). |
| 64 | - Reservation *uint64 `json:"reservation,omitempty"` |
| 65 | + Reservation *int64 `json:"reservation,omitempty"` |
| 66 | // Total memory limit (memory + swap). |
| 67 | - Swap *uint64 `json:"swap,omitempty"` |
| 68 | + Swap *int64 `json:"swap,omitempty"` |
| 69 | // Kernel memory limit (in bytes). |
| 70 | - Kernel *uint64 `json:"kernel,omitempty"` |
| 71 | + Kernel *int64 `json:"kernel,omitempty"` |
| 72 | // Kernel memory limit for tcp (in bytes) |
| 73 | - KernelTCP *uint64 `json:"kernelTCP,omitempty"` |
| 74 | + KernelTCP *int64 `json:"kernelTCP,omitempty"` |
| 75 | // How aggressive the kernel will swap memory pages. |
| 76 | Swappiness *uint64 `json:"swappiness,omitempty"` |
| 77 | } |
| 78 | @@ -486,7 +475,7 @@ type WindowsNetwork struct { |
| 79 | EndpointList []string `json:"endpointList,omitempty"` |
| 80 | // Specifies if unqualified DNS name resolution is allowed. |
| 81 | AllowUnqualifiedDNSQuery bool `json:"allowUnqualifiedDNSQuery,omitempty"` |
| 82 | - // Comma seperated list of DNS suffixes to use for name resolution. |
| 83 | + // Comma separated list of DNS suffixes to use for name resolution. |
| 84 | DNSSearchList []string `json:"DNSSearchList,omitempty"` |
| 85 | // Name (ID) of the container that we will share with the network stack. |
| 86 | NetworkSharedContainerName string `json:"networkSharedContainerName,omitempty"` |
| 87 | -- |
| 88 | 2.11.0 |
| 89 | |