diff --git a/image/spec/v1.1.md b/image/spec/v1.1.md index 0a473da6a4..f056faad58 100644 --- a/image/spec/v1.1.md +++ b/image/spec/v1.1.md @@ -326,6 +326,18 @@ whitespace. It has been added to this example for clarity. not specified, then the first entry of the Cmd array should be interpreted as the executable to run. +
+ ArgsEscaped boolean +
+
+ Used for Windows images to indicate that the Entrypoint + or Cmd or both, contain only a single element array + that is a pre-escaped, and combined into a single string, **CommandLine**. + If "true", the value in Entrypoint or CmdCmd + should be used as-is to avoid double escaping. + Note, the exact behavior of ArgsEscaped is complex + and subject to implementation details. +
Volumes struct
@@ -349,6 +361,16 @@ whitespace. It has been added to this example for clarity. in the container. This value acts as a default and is replaced by a working directory specified when creating a container. +
+ OnBuild array of strings +
+
+ This metadata defines "trigger" instructions to be executed at + a later time, when the image is used as the base for another + build. Each trigger will be executed in the context of the + downstream build, as if it had been inserted immediately after + the *FROM* instruction in the downstream Dockerfile. +
diff --git a/image/spec/v1.2.md b/image/spec/v1.2.md index cce8c843d6..deccee18bd 100644 --- a/image/spec/v1.2.md +++ b/image/spec/v1.2.md @@ -326,6 +326,18 @@ whitespace. It has been added to this example for clarity. not specified, then the first entry of the Cmd array should be interpreted as the executable to run. +
+ ArgsEscaped boolean +
+
+ Used for Windows images to indicate that the Entrypoint + or Cmd or both, contain only a single element array + that is a pre-escaped, and combined into a single string, **CommandLine**. + If "true", the value in Entrypoint or CmdCmd + should be used as-is to avoid double escaping. + Note, the exact behavior of ArgsEscaped is complex + and subject to implementation details. +
Healthcheck struct
@@ -405,6 +417,27 @@ whitespace. It has been added to this example for clarity. in the container. This value acts as a default and is replaced by a working directory specified when creating a container. +
+ OnBuild array of strings +
+
+ This metadata defines "trigger" instructions to be executed at + a later time, when the image is used as the base for another + build. Each trigger will be executed in the context of the + downstream build, as if it had been inserted immediately after + the *FROM* instruction in the downstream Dockerfile. +
+
+ Shell array of strings +
+
+ Override the default shell used for the *shell* form of + commands during "build". The default shell on Linux is + ["/bin/sh", "-c"], and ["cmd", "/S", "/C"] + on Windows. This field is set by the SHELL + instruction in a Dockerfile, and *must* be written in JSON + form. +
diff --git a/image/spec/v1.md b/image/spec/v1.md index a6be1f23b4..84932b977b 100644 --- a/image/spec/v1.md +++ b/image/spec/v1.md @@ -368,6 +368,16 @@ Here is an example image JSON file: in the container. This value acts as a default and is replaced by a working directory specified when creating a container. +
+ OnBuild array of strings +
+
+ This metadata defines "trigger" instructions to be executed at + a later time, when the image is used as the base for another + build. Each trigger will be executed in the context of the + downstream build, as if it had been inserted immediately after + the *FROM* instruction in the downstream Dockerfile. +