Browse code

Merge pull request #29589 from lixiaobing10051267/masterDockerPs

field NAMES ommitted after docker ps in commit.md
(cherry picked from commit 9eb9abea6d22e795298871500df061ec7e9644f6)

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

Brian Goff authored on 2016/12/20 23:27:13
Showing 1 changed files
... ...
@@ -49,9 +49,9 @@ created.  Supported `Dockerfile` instructions:
49 49
 ## Commit a container
50 50
 
51 51
     $ docker ps
52
-    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS
53
-    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
54
-    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
52
+    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES
53
+    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky
54
+    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton
55 55
     $ docker commit c3f279d17e0a  svendowideit/testimage:version3
56 56
     f5283438590d
57 57
     $ docker images
... ...
@@ -62,9 +62,9 @@ created.  Supported `Dockerfile` instructions:
62 62
 
63 63
     {% raw %}
64 64
     $ docker ps
65
-    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS
66
-    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
67
-    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
65
+    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES
66
+    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky
67
+    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton
68 68
     $ docker inspect -f "{{ .Config.Env }}" c3f279d17e0a
69 69
     [HOME=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin]
70 70
     $ docker commit --change "ENV DEBUG true" c3f279d17e0a  svendowideit/testimage:version3
... ...
@@ -76,9 +76,9 @@ 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
80
-    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
81
-    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
79
+    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES
80
+    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky
81
+    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton
82 82
 
83 83
     $ docker commit --change='CMD ["apachectl", "-DFOREGROUND"]' -c "EXPOSE 80" c3f279d17e0a  svendowideit/testimage:version4
84 84
     f5283438590d
... ...
@@ -87,7 +87,7 @@ created.  Supported `Dockerfile` instructions:
87 87
     89373736e2e7f00bc149bd783073ac43d0507da250e999f3f1036e0db60817c0
88 88
 
89 89
     $ docker ps
90
-    ID                  IMAGE               COMMAND                 CREATED             STATUS              PORTS
91
-    89373736e2e7        testimage:version4  "apachectl -DFOREGROU"  3 seconds ago       Up 2 seconds        80/tcp
92
-    c3f279d17e0a        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours
93
-    197387f1b436        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours
90
+    ID                  IMAGE               COMMAND                 CREATED             STATUS              PORTS              NAMES
91
+    89373736e2e7        testimage:version4  "apachectl -DFOREGROU"  3 seconds ago       Up 2 seconds        80/tcp             distracted_fermat
92
+    c3f279d17e0a        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours                            desperate_dubinsky
93
+    197387f1b436        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours                            focused_hamilton