Merge pull request opencontainers#877 from Mashimiao/fix-valuetwo-optional

ValueTwo of arg in seccomp should be optional

Author: dqminh

config-linux.md

@@ -556,7 +556,7 @@ The following parameters can be specified to set up seccomp:
 
         * **`index`** *(uint, REQUIRED)* - the index for syscall arguments in seccomp.
         * **`value`** *(uint64, REQUIRED)* - the value for syscall arguments in seccomp.
-        * **`valueTwo`** *(uint64, REQUIRED)* - the value for syscall arguments in seccomp.
+        * **`valueTwo`** *(uint64, OPTIONAL)* - the value for syscall arguments in seccomp.
         * **`op`** *(string, REQUIRED)* - the operator for syscall arguments in seccomp.
             A valid list of constants as of libseccomp v2.3.2 is shown below.
 

schema/config-windows.json

@@ -113,4 +113,4 @@
             "layerFolders"
         ]
     }
-}
+}

schema/defs-linux.json

@@ -69,7 +69,12 @@
                 "op": {
                     "$ref": "#/definitions/SeccompOperators"
                 }
-            }
+            },
+            "required": [
+                "index",
+                "value",
+                "op"
+            ]
         },
         "Syscall": {
             "type": "object",

specs-go/config.go

@@ -550,7 +550,7 @@ const (
 type LinuxSeccompArg struct {
 	Index    uint                 `json:"index"`
 	Value    uint64               `json:"value"`
-	ValueTwo uint64               `json:"valueTwo"`
+	ValueTwo uint64               `json:"valueTwo,omiempty"`
 	Op       LinuxSeccompOperator `json:"op"`
 }