Skip to content

Commit fa2ace0

Browse files
author
Tibor Vass
committed
Rebase + some fixes
Signed-off-by: Tibor Vass <tibor@docker.com>
1 parent 8d682bf commit fa2ace0

File tree

4 files changed

+20
-43
lines changed

4 files changed

+20
-43
lines changed

‎api/client/history.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (cli *DockerCli) CmdHistory(args ...string) error {
5454
fmt.Fprintf(w, "%s\t", utils.Trunc(entry.CreatedBy, 45))
5555
}
5656
fmt.Fprintf(w, "%s\t", units.HumanSize(float64(entry.Size)))
57-
fmt.Fprintf(w, "%s\n", entry.Comment)
57+
fmt.Fprintf(w, "%s", entry.Comment)
5858
}
5959
fmt.Fprintf(w, "\n")
6060
}

‎docs/man/docker-history.1.md‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,13 @@ Show the history of when and how an image was created.
2626
Only show numeric IDs. The default is *false*.
2727

2828
# EXAMPLES
29-
<<<<<<< HEAD
3029
$ docker history fedora
31-
IMAGE CREATED CREATED BY SIZE
32-
=======
33-
34-
## Show the history of images created through docker build command
35-
36-
$ sudo docker history fedora
3730
IMAGE CREATED CREATED BY SIZE COMMENT
38-
>>>>>>> Add comment column in docker history command output
3931
105182bb5e8b 5 days ago /bin/sh -c #(nop) ADD file:71356d2ad59aa3119d 372.7 MB
4032
73bd853d2ea5 13 days ago /bin/sh -c #(nop) MAINTAINER Lokesh Mandvekar 0 B
4133
511136ea3c5a 10 months ago 0 B Imported from -
4234

43-
## Show the history of images created through docker commit command
35+
## Display comments in the image history
4436
The `docker commit` command has a **-m** flag for adding comments to the image. These comments will be displayed in the image history.
4537

4638
$ sudo docker history docker:scm

‎docs/sources/reference/commandline/cli.md‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,17 +1151,7 @@ This will create a new Bash session in the container `ubuntu_bash`.
11511151

11521152
To see how the `docker:latest` image was built:
11531153

1154-
<<<<<<< HEAD
11551154
$ docker history docker
1156-
IMAGE CREATED CREATED BY SIZE
1157-
3e23a5875458790b7a806f95f7ec0d0b2a5c1659bfc899c89f939f6d5b8f7094 8 days ago /bin/sh -c #(nop) ENV LC_ALL=C.UTF-8 0 B
1158-
8578938dd17054dce7993d21de79e96a037400e8d28e15e7290fea4f65128a36 8 days ago /bin/sh -c dpkg-reconfigure locales && locale-gen C.UTF-8 && /usr/sbin/update-locale LANG=C.UTF-8 1.245 MB
1159-
be51b77efb42f67a5e96437b3e102f81e0a1399038f77bf28cea0ed23a65cf60 8 days ago /bin/sh -c apt-get update && apt-get install -y git libxml2-dev python build-essential make gcc python-dev locales python-pip 338.3 MB
1160-
4b137612be55ca69776c7f30c2d2dd0aa2e7d72059820abf3e25b629f887a084 6 weeks ago /bin/sh -c #(nop) ADD jessie.tar.xz in / 121 MB
1161-
750d58736b4b6cc0f9a9abe8f258cef269e3e9dceced1146503522be9f985ada 6 weeks ago /bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -t jessie.tar.xz jessie http://http.debian.net/debian 0 B
1162-
511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158 9 months ago 0 B
1163-
=======
1164-
$ sudo docker history docker
11651155
IMAGE CREATED CREATED BY SIZE COMMENT
11661156
3e23a5875458 8 days ago /bin/sh -c #(nop) ENV LC_ALL=C.UTF-8 0 B
11671157
8578938dd170 8 days ago /bin/sh -c dpkg-reconfigure locales && loc 1.245 MB
@@ -1172,14 +1162,13 @@ To see how the `docker:latest` image was built:
11721162

11731163
To see how the `docker:apache` image was added to a container's base image:
11741164

1175-
$ sudo docker history docker:scm
1165+
$ docker history docker:scm
11761166
IMAGE CREATED CREATED BY SIZE COMMENT
11771167
2ac9d1098bf1 3 months ago /bin/bash 241.4 MB Added Apache to Fedora base image
11781168
88b42ffd1f7c 5 months ago /bin/sh -c #(nop) ADD file:1fd8d7f9f6557cafc7 373.7 MB
11791169
c69cab00d6ef 5 months ago /bin/sh -c #(nop) MAINTAINER Lokesh Mandvekar 0 B
11801170
511136ea3c5a 19 months ago 0 B Imported from -
11811171

1182-
>>>>>>> Add comment column in docker history command output
11831172

11841173
## images
11851174

‎integration-cli/docker_cli_history_test.go‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package main
33
import (
44
"fmt"
55
"os/exec"
6-
"regexp"
76
"strings"
87
"testing"
98
)
@@ -85,46 +84,43 @@ func TestHistoryNonExistentImage(t *testing.T) {
8584
}
8685

8786
func TestHistoryImageWithComment(t *testing.T) {
87+
name := "testhistoryimagewithcomment"
88+
defer deleteContainer(name)
89+
defer deleteImages(name)
8890

8991
// make a image through docker commit <container id> [ -m messages ]
90-
runCmd := exec.Command(dockerBinary, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")
91-
out, _, _, err := runCommandWithStdoutStderr(runCmd)
92+
//runCmd := exec.Command(dockerBinary, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")
93+
runCmd := exec.Command(dockerBinary, "run", "--name", name, "busybox", "true")
94+
out, _, err := runCommandWithOutput(runCmd)
9295
if err != nil {
9396
t.Fatalf("failed to run container: %s, %v", out, err)
9497
}
9598

96-
cleanedContainerID := stripTrailingCharacters(out)
97-
98-
waitCmd := exec.Command(dockerBinary, "wait", cleanedContainerID)
99-
if _, _, err = runCommandWithOutput(waitCmd); err != nil {
99+
waitCmd := exec.Command(dockerBinary, "wait", name)
100+
if out, _, err := runCommandWithOutput(waitCmd); err != nil {
100101
t.Fatalf("error thrown while waiting for container: %s, %v", out, err)
101102
}
102103

103-
commitCmd := exec.Command(dockerBinary, "commit", "-m=This is a comment", cleanedContainerID)
104-
out, _, err = runCommandWithOutput(commitCmd)
105-
if err != nil {
104+
comment := "This_is_a_comment"
105+
106+
commitCmd := exec.Command(dockerBinary, "commit", "-m="+comment, name, name)
107+
if out, _, err := runCommandWithOutput(commitCmd); err != nil {
106108
t.Fatalf("failed to commit container to image: %s, %v", out, err)
107109
}
108110

109-
cleanedImageID := stripTrailingCharacters(out)
110-
deleteContainer(cleanedContainerID)
111-
defer deleteImages(cleanedImageID)
112-
113111
// test docker history <image id> to check comment messages
114-
historyCmd := exec.Command(dockerBinary, "history", cleanedImageID)
112+
historyCmd := exec.Command(dockerBinary, "history", name)
115113
out, exitCode, err := runCommandWithOutput(historyCmd)
116114
if err != nil || exitCode != 0 {
117115
t.Fatalf("failed to get image history: %s, %v", out, err)
118116
}
119117

120-
expectedValue := "This is a comment"
121-
122-
outputLine := strings.Split(out, "\n")[1]
123-
outputTabs := regexp.MustCompile(" +").Split(outputLine, -1)
118+
outputTabs := strings.Fields(strings.Split(out, "\n")[1])
119+
//outputTabs := regexp.MustCompile(" +").Split(outputLine, -1)
124120
actualValue := outputTabs[len(outputTabs)-1]
125121

126-
if !strings.Contains(actualValue, expectedValue) {
127-
t.Fatalf("Expected comments \"%s\", but found \"%s\"", expectedValue, actualValue)
122+
if !strings.Contains(actualValue, comment) {
123+
t.Fatalf("Expected comments %q, but found %q", comment, actualValue)
128124
}
129125

130126
logDone("history - history on image with comment")

0 commit comments

Comments
 (0)