Browse code

Merge pull request #29744 from yuexiao-wang/update-docker-ps

Update the field 'CONTAINER ID' for docker ps
(cherry picked from commit 01c62d6e54e49e2c954fb73881ede66ad6fa1b61)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2016/12/28 19:46:06
Showing 1 changed files
... ...
@@ -49,7 +49,7 @@ created.  Supported `Dockerfile` instructions:
49 49
 ## Commit a container
50 50
 
51 51
     $ docker ps
52
-    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES
52
+    CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES
53 53
     c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky
54 54
     197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton
55 55
     $ docker commit c3f279d17e0a  svendowideit/testimage:version3
... ...
@@ -62,7 +62,7 @@ created.  Supported `Dockerfile` instructions:
62 62
 
63 63
     {% raw %}
64 64
     $ docker ps
65
-    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES
65
+    ICONTAINER ID       IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES
66 66
     c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky
67 67
     197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton
68 68
     $ docker inspect -f "{{ .Config.Env }}" c3f279d17e0a
... ...
@@ -76,7 +76,7 @@ created.  Supported `Dockerfile` instructions:
76 76
 ## Commit a container with new `CMD` and `EXPOSE` instructions
77 77
 
78 78
     $ docker ps
79
-    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES
79
+    CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES
80 80
     c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky
81 81
     197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton
82 82
 
... ...
@@ -87,7 +87,7 @@ created.  Supported `Dockerfile` instructions:
87 87
     89373736e2e7f00bc149bd783073ac43d0507da250e999f3f1036e0db60817c0
88 88
 
89 89
     $ docker ps
90
-    ID                  IMAGE               COMMAND                 CREATED             STATUS              PORTS              NAMES
90
+    CONTAINER ID        IMAGE               COMMAND                 CREATED             STATUS              PORTS              NAMES
91 91
     89373736e2e7        testimage:version4  "apachectl -DFOREGROU"  3 seconds ago       Up 2 seconds        80/tcp             distracted_fermat
92 92
     c3f279d17e0a        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours                            desperate_dubinsky
93 93
     197387f1b436        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours                            focused_hamilton