소스 검색

Merge pull request #46381 from vvoland/image-spec-healthcheck-startinterval

image/spec: Add Healthcheck.StartInterval (v1.3)
Sebastiaan van Stijn 1 년 전
부모
커밋
e9b3a16cdc
3개의 변경된 파일18개의 추가작업 그리고 3개의 파일을 삭제
  1. 8 0
      image/spec/README.md
  2. 9 2
      image/spec/spec.md
  3. 1 1
      image/spec/v1.2.md

+ 8 - 0
image/spec/README.md

@@ -23,6 +23,14 @@ and in [OCI Image Format Specification](https://github.com/opencontainers/image-
 
 All 1.X versions are compatible with older ones.
 
+### [v1.3](spec.md)
+
+* Implemented in Docker v25.0
+
+Changes:
+
+* `StartInterval` was added to the `Healthcheck` struct in the Image JSON
+
 ### [v1.2](https://github.com/moby/moby/blob/daa4618da826fb1de4fc2478d88196edbba49b2f/image/spec/v1.2.md)
 
 * Implemented in Docker v1.12 (July, 2016)

+ 9 - 2
image/spec/spec.md

@@ -1,4 +1,4 @@
-# Docker Image Specification v1.2.0
+# Docker Image Specification v1.3.0
 
 An *Image* is an ordered collection of root filesystem changes and the
 corresponding execution parameters for use within a container runtime. This
@@ -351,7 +351,8 @@ whitespace. It has been added to this example for clarity.
   ],
   "Interval": 30000000000,
   "Timeout": 10000000000,
-  "Retries": 3
+  "Retries": 3,
+  "StartInterval": 3000000000
 }</pre>
                 The object has the following fields.
                 <dl>
@@ -388,6 +389,12 @@ whitespace. It has been added to this example for clarity.
                     <dd>
                         The number of consecutive failures needed to consider a container as unhealthy.
                     </dd>
+                    <dt>
+                        StartInterval <code>integer</code>
+                    <dt>
+                    <dd>
+                        Number of nanoseconds to wait between probe attempts during the start period.
+                    </dd>
                 </dl>
                 In each case, the field can be omitted to indicate that the
                 value should be inherited from the base layer. These values act

+ 1 - 1
image/spec/v1.2.md

@@ -1,7 +1,7 @@
 # Docker Image Specification v1.2.0
 
 This Document described the Docker Image Specification used by Docker Engine
-v1.12.0 and up.
+v1.12.0 and up. It has been superseded by Docker Image Specification v1.3.0.
 
 The Docker Image Specification is the image specification as used by the
 Docker Engine, and was used as foundation of the OCI image specification.