From 6458b4e9519033d772f5042c332e510ca3f3dff6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Dec 2016 11:46:06 +0100 Subject: [PATCH] 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 --- docs/reference/commandline/commit.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/reference/commandline/commit.md b/docs/reference/commandline/commit.md index e9a8717012..9ca3ec5a90 100644 --- a/docs/reference/commandline/commit.md +++ b/docs/reference/commandline/commit.md @@ -49,7 +49,7 @@ created. Supported `Dockerfile` instructions: ## Commit a container $ docker ps - ID IMAGE COMMAND CREATED STATUS PORTS NAMES + CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES c3f279d17e0a ubuntu:12.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky 197387f1b436 ubuntu:12.04 /bin/bash 7 days ago Up 25 hours focused_hamilton $ docker commit c3f279d17e0a svendowideit/testimage:version3 @@ -62,7 +62,7 @@ created. Supported `Dockerfile` instructions: {% raw %} $ docker ps - ID IMAGE COMMAND CREATED STATUS PORTS NAMES + ICONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES c3f279d17e0a ubuntu:12.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky 197387f1b436 ubuntu:12.04 /bin/bash 7 days ago Up 25 hours focused_hamilton $ docker inspect -f "{{ .Config.Env }}" c3f279d17e0a @@ -76,7 +76,7 @@ created. Supported `Dockerfile` instructions: ## Commit a container with new `CMD` and `EXPOSE` instructions $ docker ps - ID IMAGE COMMAND CREATED STATUS PORTS NAMES + CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES c3f279d17e0a ubuntu:12.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky 197387f1b436 ubuntu:12.04 /bin/bash 7 days ago Up 25 hours focused_hamilton @@ -87,7 +87,7 @@ created. Supported `Dockerfile` instructions: 89373736e2e7f00bc149bd783073ac43d0507da250e999f3f1036e0db60817c0 $ docker ps - ID IMAGE COMMAND CREATED STATUS PORTS NAMES + CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 89373736e2e7 testimage:version4 "apachectl -DFOREGROU" 3 seconds ago Up 2 seconds 80/tcp distracted_fermat c3f279d17e0a ubuntu:12.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky 197387f1b436 ubuntu:12.04 /bin/bash 7 days ago Up 25 hours focused_hamilton