Browse code

Merge pull request #28102 from yongtang/11052016-docs-build-Step

Update docs for the output of `docker build` (Step 1/...)

Vincent Demeester authored on 2016/11/07 17:28:08
Showing 10 changed files
... ...
@@ -1204,7 +1204,7 @@ Build an image from a Dockerfile
1204 1204
     HTTP/1.1 200 OK
1205 1205
     Content-Type: application/json
1206 1206
 
1207
-    {"stream": "Step 1..."}
1207
+    {"stream": "Step 1/5..."}
1208 1208
     {"stream": "..."}
1209 1209
     {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
1210 1210
 
... ...
@@ -1246,7 +1246,7 @@ Build an image from a Dockerfile
1246 1246
     HTTP/1.1 200 OK
1247 1247
     Content-Type: application/json
1248 1248
 
1249
-    {"stream": "Step 1..."}
1249
+    {"stream": "Step 1/5..."}
1250 1250
     {"stream": "..."}
1251 1251
     {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
1252 1252
 
... ...
@@ -1377,7 +1377,7 @@ Build an image from a Dockerfile
1377 1377
     HTTP/1.1 200 OK
1378 1378
     Content-Type: application/json
1379 1379
 
1380
-    {"stream": "Step 1..."}
1380
+    {"stream": "Step 1/5..."}
1381 1381
     {"stream": "..."}
1382 1382
     {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
1383 1383
 
... ...
@@ -1458,7 +1458,7 @@ Build an image from a Dockerfile
1458 1458
     HTTP/1.1 200 OK
1459 1459
     Content-Type: application/json
1460 1460
 
1461
-    {"stream": "Step 1..."}
1461
+    {"stream": "Step 1/5..."}
1462 1462
     {"stream": "..."}
1463 1463
     {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
1464 1464
 
... ...
@@ -1636,7 +1636,7 @@ Build an image from a Dockerfile
1636 1636
     HTTP/1.1 200 OK
1637 1637
     Content-Type: application/json
1638 1638
 
1639
-    {"stream": "Step 1..."}
1639
+    {"stream": "Step 1/5..."}
1640 1640
     {"stream": "..."}
1641 1641
     {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
1642 1642
 
... ...
@@ -1669,7 +1669,7 @@ Build an image from a Dockerfile
1669 1669
     HTTP/1.1 200 OK
1670 1670
     Content-Type: application/json
1671 1671
 
1672
-    {"stream": "Step 1..."}
1672
+    {"stream": "Step 1/5..."}
1673 1673
     {"stream": "..."}
1674 1674
     {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
1675 1675
 
... ...
@@ -1668,7 +1668,7 @@ Build an image from a Dockerfile
1668 1668
     HTTP/1.1 200 OK
1669 1669
     Content-Type: application/json
1670 1670
 
1671
-    {"stream": "Step 1..."}
1671
+    {"stream": "Step 1/5..."}
1672 1672
     {"stream": "..."}
1673 1673
     {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
1674 1674
 
... ...
@@ -1756,7 +1756,7 @@ Build an image from a Dockerfile
1756 1756
     HTTP/1.1 200 OK
1757 1757
     Content-Type: application/json
1758 1758
 
1759
-    {"stream": "Step 1..."}
1759
+    {"stream": "Step 1/5..."}
1760 1760
     {"stream": "..."}
1761 1761
     {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
1762 1762
 
... ...
@@ -97,15 +97,15 @@ the `Using cache` message in the console output.
97 97
 
98 98
     $ docker build -t svendowideit/ambassador .
99 99
     Sending build context to Docker daemon 15.36 kB
100
-    Step 1 : FROM alpine:3.2
100
+    Step 1/4 : FROM alpine:3.2
101 101
      ---> 31f630c65071
102
-    Step 2 : MAINTAINER SvenDowideit@home.org.au
102
+    Step 2/4 : MAINTAINER SvenDowideit@home.org.au
103 103
      ---> Using cache
104 104
      ---> 2a1c91448f5f
105
-    Step 3 : RUN apk update &&      apk add socat &&        rm -r /var/cache/
105
+    Step 3/4 : RUN apk update &&      apk add socat &&        rm -r /var/cache/
106 106
      ---> Using cache
107 107
      ---> 21ed6e7fbb73
108
-    Step 4 : CMD env | grep _TCP= | (sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat -t 100000000 TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \&/' && echo wait) | sh
108
+    Step 4/4 : CMD env | grep _TCP= | (sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat -t 100000000 TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \&/' && echo wait) | sh
109 109
      ---> Using cache
110 110
      ---> 7ea8aef582cc
111 111
     Successfully built 7ea8aef582cc
... ...
@@ -174,9 +174,9 @@ $ docker build -t fail .
174 174
 
175 175
 Sending build context to Docker daemon 2.048 kB
176 176
 Sending build context to Docker daemon
177
-Step 1 : FROM busybox
177
+Step 1/3 : FROM busybox
178 178
  ---> 4986bf8c1536
179
-Step 2 : RUN exit 13
179
+Step 2/3 : RUN exit 13
180 180
  ---> Running in e26670ec7a0a
181 181
 INFO[0000] The command [/bin/sh -c exit 13] returned a non-zero code: 13
182 182
 $ echo $?
... ...
@@ -195,10 +195,10 @@ See also:
195 195
 $ docker build .
196 196
 
197 197
 Uploading context 10240 bytes
198
-Step 1 : FROM busybox
198
+Step 1/3 : FROM busybox
199 199
 Pulling repository busybox
200 200
  ---> e9aa60c60128MB/2.284 MB (100%) endpoint: https://cdn-registry-1.docker.io/v1/
201
-Step 2 : RUN ls -lh /
201
+Step 2/3 : RUN ls -lh /
202 202
  ---> Running in 9c9e81692ae9
203 203
 total 24
204 204
 drwxr-xr-x    2 root     root        4.0K Mar 12  2013 bin
... ...
@@ -212,7 +212,7 @@ dr-xr-xr-x   13 root     root           0 Nov 15 23:34 sys
212 212
 drwxr-xr-x    2 root     root        4.0K Mar 12  2013 tmp
213 213
 drwxr-xr-x    2 root     root        4.0K Nov 15 23:34 usr
214 214
  ---> b35f4035db3f
215
-Step 3 : CMD echo Hello world
215
+Step 3/3 : CMD echo Hello world
216 216
  ---> Running in 02071fceb21b
217 217
  ---> f52f38b7823e
218 218
 Successfully built f52f38b7823e
... ...
@@ -248,12 +248,12 @@ specify an arbitrary Git repository by using the `git://` or `git@` scheme.
248 248
 $ docker build -f ctx/Dockerfile http://server/ctx.tar.gz
249 249
 
250 250
 Downloading context: http://server/ctx.tar.gz [===================>]    240 B/240 B
251
-Step 1 : FROM busybox
251
+Step 1/3 : FROM busybox
252 252
  ---> 8c2e06607696
253
-Step 2 : ADD ctx/container.cfg /
253
+Step 2/3 : ADD ctx/container.cfg /
254 254
  ---> e7829950cee3
255 255
 Removing intermediate container b35224abf821
256
-Step 3 : CMD /bin/ls
256
+Step 3/3 : CMD /bin/ls
257 257
  ---> Running in fbc63d321d73
258 258
  ---> 3286931702ad
259 259
 Removing intermediate container fbc63d321d73
... ...
@@ -293,9 +293,9 @@ $ docker build .
293 293
 
294 294
 Uploading context 18.829 MB
295 295
 Uploading context
296
-Step 1 : FROM busybox
296
+Step 1/2 : FROM busybox
297 297
  ---> 769b9341d937
298
-Step 2 : CMD echo Hello world
298
+Step 2/2 : CMD echo Hello world
299 299
  ---> Using cache
300 300
  ---> 99cc1ad10469
301 301
 Successfully built 99cc1ad10469
... ...
@@ -303,9 +303,9 @@ $ echo ".git" > .dockerignore
303 303
 $ docker build .
304 304
 Uploading context  6.76 MB
305 305
 Uploading context
306
-Step 1 : FROM busybox
306
+Step 1/2 : FROM busybox
307 307
  ---> 769b9341d937
308
-Step 2 : CMD echo Hello world
308
+Step 2/2 : CMD echo Hello world
309 309
  ---> Using cache
310 310
  ---> 99cc1ad10469
311 311
 Successfully built 99cc1ad10469