Merge pull request #206 from joshwget/custom-fields

Custom fields

rancher/configs.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/engine-api/types/container"
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/libcompose/config"
 	"github.com/docker/libcompose/docker/service"
 	"github.com/docker/libcompose/utils"

rancher/service.go

@@ -10,7 +10,7 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/engine-api/types/container"
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/libcompose/config"
 	"github.com/docker/libcompose/docker/service"
 	"github.com/docker/libcompose/labels"

scripts/config_schema_v1.json

@@ -18,6 +18,8 @@
       "type": "object",
 
       "properties": {
+        "blkio_weight": {"type": ["number", "string"]},
+        "blkio_weight_devices": {"$ref": "#/definitions/list_of_strings"},
         "build": {"type": "string"},
         "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
@@ -30,15 +32,19 @@
           ]
         },
         "container_name": {"type": "string"},
+        "cpu_period": {"type": ["number", "string"]},
         "cpu_shares": {"type": ["number", "string"]},
         "cpu_quota": {"type": ["number", "string"]},
         "cpuset": {"type": "string"},
+        "device_read_bps": {"$ref": "#/definitions/list_or_dict"},
         "device_read_iops": {"$ref": "#/definitions/list_or_dict"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "device_write_bps": {"$ref": "#/definitions/list_or_dict"},
         "device_write_iops": {"$ref": "#/definitions/list_or_dict"},
         "default_cert": {"type": "string"},
         "disks": {"type": "array"},
         "dns": {"$ref": "#/definitions/string_or_list"},
+        "dns_opt": {"$ref": "#/definitions/list_or_dict"},
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "dockerfile": {"type": "string"},
         "domainname": {"type": "string"},
@@ -85,6 +91,7 @@
         "hostname": {"type": "string"},
         "image": {"type": "string"},
         "ipc": {"type": "string"},
+        "isolation": {"type": "string"},
         "labels": {"$ref": "#/definitions/list_or_dict"},
         "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "load_balancer_config": {"type": "object"},
@@ -93,10 +100,20 @@
         "mac_address": {"type": "string"},
         "memory": {"type": ["number", "string"]},
         "mem_limit": {"type": ["number", "string"]},
+        "mem_reservation": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
         "mem_swappiness": {"type": "integer"},
         "metadata": {"type": "object"},
         "net": {"type": "string"},
+        "oom_kill_disable": {"type": "boolean"},
+        "oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
+        "group_add": {
+            "type": "array",
+            "items": {
+                "type": ["string", "number"]
+            },
+            "uniqueItems": true
+        },
         "pid": {"type": ["string", "null"]},
 
         "ports": {

scripts/config_schema_v2.0.json

@@ -18,6 +18,8 @@
       "type": "object",
 
       "properties": {
+        "blkio_weight": {"type": ["number", "string"]},
+        "blkio_weight_devices": {"$ref": "#/definitions/list_of_strings"},
         "build": {
           "oneOf": [
             {"type": "string"},
@@ -43,16 +45,20 @@
           ]
         },
         "container_name": {"type": "string"},
+        "cpu_period": {"type": ["number", "string"]},
         "cpu_shares": {"type": ["number", "string"]},
         "cpu_quota": {"type": ["number", "string"]},
         "cpuset": {"type": "string"},
         "default_cert": {"type": "string"},
         "depends_on": {"$ref": "#/definitions/list_of_strings"},
+        "device_read_bps": {"$ref": "#/definitions/list_or_dict"},
         "device_read_iops": {"$ref": "#/definitions/list_or_dict"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
+        "device_write_bps": {"$ref": "#/definitions/list_or_dict"},
         "device_write_iops": {"$ref": "#/definitions/list_or_dict"},
         "disks": {"type": "array"},
         "dns": {"$ref": "#/definitions/string_or_list"},
+        "dns_opt": {"$ref": "#/definitions/list_or_dict"},
         "dns_search": {"$ref": "#/definitions/string_or_list"},
         "domainname": {"type": "string"},
         "entrypoint": {
@@ -98,6 +104,7 @@
         "hostname": {"type": "string"},
         "image": {"type": "string"},
         "ipc": {"type": "string"},
+        "isolation": {"type": "string"},
         "labels": {"$ref": "#/definitions/list_or_dict"},
         "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "load_balancer_config": {"type": "object"},
@@ -115,6 +122,7 @@
         "mac_address": {"type": "string"},
         "memory": {"type": ["number", "string"]},
         "mem_limit": {"type": ["number", "string"]},
+        "mem_reservation": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
         "mem_swappiness": {"type": "integer"},
         "metadata": {"type": "object"},
@@ -145,7 +153,15 @@
             }
           ]
         },
+        "oom_kill_disable": {"type": "boolean"},
         "oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
+        "group_add": {
+            "type": "array",
+            "items": {
+                "type": ["string", "number"]
+            },
+            "uniqueItems": true
+        },
         "pid": {"type": ["string", "null"]},
 
         "ports": {

trash.conf

@@ -1,11 +1,10 @@
 github.com/Sirupsen/logrus 26709e2714106fb8ad40b773b711ebce25b78914
 github.com/awslabs/aws-sdk-go 75d65bc91a02d9f67cf4a5297c46d4d2c4c09c6c
 github.com/urfave/cli v1.18.0
-github.com/docker/distribution 5bbf65499960b184fe8e0f045397375e1a6722b8
-github.com/docker/docker 534753663161334baba06f13b8efa4cad22b5bc5
-github.com/docker/engine-api 62043eb79d581a32ea849645277023c550732e52
-github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
-github.com/docker/libcompose 777d5bb20ebfa9b5cac8f1ea1707a4c53399a07e https://github.com/rancher/libcompose
+github.com/docker/distribution 77b9d2997abcded79a5314970fe69a44c93c25fb
+github.com/docker/docker 601004e1a714d77d3a43e957b8ae8adbc867b280
+github.com/docker/go-connections 988efe982fdecb46f01d53465878ff1f2ff411ce
+github.com/docker/libcompose 1b34f8534f68a07b7bc1d36e9ddc33915ed53422 https://github.com/rancher/libcompose
 github.com/flynn/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
 github.com/gorilla/context 14f550f51a
 github.com/gorilla/mux e444e69cbd
@@ -17,15 +16,16 @@ github.com/rancher/event-subscriber ddef5975d2b174e234d7232c811bd55e5e2bf22f
 github.com/rancher/go-rancher f0378de1178a553cfb64666c0281486f593f0f05
 github.com/rancher/rancher-catalog-service a3a8b500adceb82b3a0387b2c7b06a60e7eeee9a
 github.com/vaughan0/go-ini a98ad7ee00ec53921f08832bc06ecf7fd600e6a1
-golang.org/x/net 3a29182c25eeabbaaf94daaeecbc7823d86261e7
 golang.org/x/crypto 4d48e5fa3d62b5e6e71260571bf76c767198ca02
+golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git
+golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46
+golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb
 gopkg.in/yaml.v2 e4d366fc3c7938e2958e662b4258c7a89e1f0e3e
 github.com/docker/go-units f2d77a61e3c169b43402a0a1e84f06daf29b8190
 github.com/vbatts/tar-split v0.9.11
 github.com/Azure/go-ansiterm 388960b655244e76e24c75f48631564eaefade62
-github.com/Microsoft/go-winio v0.3.0
+github.com/Microsoft/go-winio v0.3.4
 github.com/xeipuuv/gojsonschema ac452913faa25c08bb78810d3e6f88b8a39f8f25
 github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45
 github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a
 github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be
-github.com/vdemeester/docker-events be74d4929ec1ad118df54349fda4b0cba60f849b