dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-05 23:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52430 from thaJeztah/fix_sprintfs

Browse Source 
fix formatting strings for go1.26
This commit is contained in:
Paweł Gronowski
2026-04-22 13:26:04 +02:00
committed by GitHub
parent dae609c4d4 5d143db66b
commit dff719e367
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/builder/dockerfile/dispatchers.go
View File

@@ -471,11 +471,11 @@ func dispatchHealthcheck(ctx context.Context, d dispatchRequest, c *instructions
if runConfig.Healthcheck != nil {
oldCmd := runConfig.Healthcheck.Test
if len(oldCmd) > 0 && oldCmd[0] != "NONE" {
fmt.Fprintf(d.builder.Stdout, "Note: overriding previous HEALTHCHECK: %v\n", oldCmd)
fmt.Fprintf(d.builder.Stdout, "Note: overriding previous HEALTHCHECK: %+v\n", oldCmd)
}
}
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

2
daemon/daemon_test.go
View File

@@ -288,7 +288,7 @@ func TestMerge(t *testing.T) {
}
for portSpecs := range configUser.ExposedPorts {
if portSpecs.Num() != 0 && portSpecs.Num() != 1111 && portSpecs.Num() != 2222 && portSpecs.Num() != 3333 {
t.Fatalf("Expected %q or %q or %q or %q, found %s", 0, 1111, 2222, 3333, portSpecs)
t.Fatalf("Expected %d or %d or %d or %d, found %d", 0, 1111, 2222, 3333, portSpecs)
}
}
}

2
daemon/internal/streamformatter/streamformatter.go
View File

@@ -94,7 +94,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 := jsonstream.Progress{
Current: prog.Current,

2
internal/testutil/daemon/daemon.go
View File

@@ -811,7 +811,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)
}