1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
From: Reinhard Tartler <siretart@tauware.de>
Description: Fix compilation errors from newer docker vet
Debian-Bug: https://bugs.debian.org/1129110
Index: docker.io/engine/pkg/streamformatter/streamformatter.go
===================================================================
--- docker.io.orig/engine/pkg/streamformatter/streamformatter.go
+++ docker.io/engine/pkg/streamformatter/streamformatter.go
@@ -117,7 +117,7 @@ type progressOutput struct {
func (out *progressOutput) WriteProgress(prog progress.Progress) error {
var formatted []byte
if prog.Message != "" {
- formatted = out.sf.formatStatus(prog.ID, prog.Message)
+ formatted = out.sf.formatStatus(prog.ID, "%s", prog.Message)
} else {
jsonProgress := jsonmessage.JSONProgress{Current: prog.Current, Total: prog.Total, HideCounts: prog.HideCounts, Units: prog.Units}
formatted = out.sf.formatProgress(prog.ID, prog.Action, &jsonProgress, prog.Aux)
Index: docker.io/engine/testutil/daemon/daemon.go
===================================================================
--- docker.io.orig/engine/testutil/daemon/daemon.go
+++ docker.io/engine/testutil/daemon/daemon.go
@@ -739,7 +739,7 @@ out2:
d.log.Logf("[%s] tried to interrupt daemon for %d times, now try to kill it", d.id, i)
break out2
}
- d.log.Logf("[%d] attempt #%d/5: daemon is still running with pid %d", i, d.cmd.Process.Pid)
+ d.log.Logf("[%s] attempt #%d/5: daemon is still running with pid %d", d.id, i, d.cmd.Process.Pid)
if err := d.cmd.Process.Signal(os.Interrupt); err != nil {
return errors.Wrapf(err, "[%s] attempt #%d/5 could not send signal", d.id, i)
}
Index: docker.io/engine/builder/dockerfile/dispatchers.go
===================================================================
--- docker.io.orig/engine/builder/dockerfile/dispatchers.go
+++ docker.io/engine/builder/dockerfile/dispatchers.go
@@ -469,7 +469,7 @@ func dispatchHealthcheck(ctx context.Con
}
}
runConfig.Healthcheck = c.Health
- return d.builder.commit(ctx, d.state, fmt.Sprintf("HEALTHCHECK %q", runConfig.Healthcheck))
+ return d.builder.commit(ctx, d.state, fmt.Sprintf("HEALTHCHECK %v", runConfig.Healthcheck))
}
// ENTRYPOINT /usr/sbin/nginx
Index: docker.io/engine/daemon/daemon_test.go
===================================================================
--- docker.io.orig/engine/daemon/daemon_test.go
+++ docker.io/engine/daemon/daemon_test.go
@@ -293,7 +293,7 @@ func TestMerge(t *testing.T) {
}
for portSpecs := range configUser.ExposedPorts {
if portSpecs.Port() != "0" && portSpecs.Port() != "1111" && portSpecs.Port() != "2222" && portSpecs.Port() != "3333" {
- t.Fatalf("Expected %q or %q or %q or %q, found %s", 0, 1111, 2222, 3333, portSpecs)
+ t.Fatalf("Expected %q or %q or %q or %q, found %s", "0", "1111", "2222", "3333", portSpecs)
}
}
}
|
