Address review comments

Signed-off-by: Mrunal Patel <[email protected]>

Author: mrunalp

runtime.md

@@ -20,8 +20,7 @@ This event needs to be captured by oc to run onstop event handlers.
 Hooks allow one to run code before/after various lifecycle events of the container.
 The state of the container is passed to the hooks over stdin, so the hooks could get the information they need to do their work.
 
-Hook paths are absolute are executed from the host's filesystem.
-The working directory for the hooks is set to the container's root filesystem unless overriden in the configuration.
+Hook paths are absolute and are executed from the host's filesystem.
 
 ### Pre-start
 The pre-start hooks are called after the container process is started but before the user supplied command is executed.
@@ -37,26 +36,18 @@ If a hook returns a non-zero exit code, then an error is logged and the remainin
 
 ```json
     "hooks" : {
-        "pre-start": [
+        "prestart": [
             {
-                "path": "/usr/bin/fix-mounts",
-                "args": ["arg1", "arg2"],
-                "env": {
-                           "key1": "value1"
-                       },
-                "dir": ""
-            },
-            {
-               "path": "/usr/libexec/acme/bin/setup-network"
+                "args": ["/usr/bin/fix-mounts", "arg1", "arg2"],
+                "env":  [ "key1=value1"],
             }
         ],
-        "post-stop": [
+        "poststop": [
             {
-               "path": "/usr/sbin/cleanup.sh",
-               "args": ["-f"]
+                "args": ["/usr/sbin/cleanup.sh", "-f"]
             }
         ]
     }
 ```
 
-`path` is required for a hook. `args`, `env` and `dir` are optional.
+`args` are required for a hook. `env` is optional.

spec.go

@@ -15,10 +15,15 @@ type Spec struct {
 	Hostname string `json:"hostname"`
 	// Mounts profile configuration for adding mounts to the container's filesystem.
 	Mounts []Mount `json:"mounts"`
-	// Prestart is a list of commands to be run before the container process is executed.
-	Prestart []Command `json:"prestart"`
-	// Poststop is a list of commands to be run after the container process exits.
-	Poststop []Command `json:"poststop"`
+	// Hooks are the commands run at various lifecycle events of the container.
+	Hooks Hooks `json:"hooks"`
+}
+
+type Hooks struct {
+	// Prestart is a list of hooks to be run before the container process is executed.
+	Prestart []Hook `json:"prestart"`
+	// Poststop is a list of hooks to be run after the container process exits.
+	Poststop []Hook `json:"poststop"`
 }
 
 // Mount specifies a mount for a container.
@@ -66,9 +71,8 @@ type Platform struct {
 	Arch string `json:"arch"`
 }
 
-type Command struct {
-	Path string   `json:"path"`
+// Hook specifies a command that is run at a particular event in the lifecycle of a container.
+type Hook struct {
 	Args []string `json:"args"`
 	Env  []string `json:"env"`
-	Dir  string   `json:"dir"`
 }