Merge pull request opencontainers#764 from wking/strictly-positive-ti…

…meout config: Require strictly-positive timeout values
wking · May 9, 2017 · e1b2e61 · e1b2e61
2 parents 01ec62d + ecf7314
commit e1b2e61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/config.md b/config.md
@@ -357,6 +357,7 @@ Hooks allow for the configuration of custom actions related to the [lifecycle](r
     * **`args`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2001 `execv`'s *argv*][ieee-1003.1-2001-xsh-exec].
     * **`env`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2001's `environ`][ieee-1003.1-2001-xbd-c8.1].
     * **`timeout`** (int, OPTIONAL) is the number of seconds before aborting the hook.
+      If set, `timeout` MUST be greater than zero.
   * **`poststart`** (array of objects, OPTIONAL) is an array of [post-start hooks](#poststart).
     Entries in the array have the same schema as pre-start entries.
   * **`poststop`** (array of objects, OPTIONAL) is an array of [post-stop hooks](#poststop).

diff --git a/schema/defs.json b/schema/defs.json
@@ -91,7 +91,8 @@
                     "$ref": "#/definitions/Env"
                 },
                 "timeout": {
-                    "type": "integer"
+                    "type": "integer",
+                    "minimum": 1
                 }
             },
             "required": [