fix

containerd · Dec 10, 2024 · 662bb05 · 662bb05
1 parent 4a430ef
commit 662bb05
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/pkg/cmd/compose/compose.go b/pkg/cmd/compose/compose.go
@@ -27,7 +27,6 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/errdefs"
-	"github.com/containerd/log"
 	"github.com/containerd/platforms"
 
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
@@ -113,7 +112,6 @@ func New(client *containerd.Client, globalOptions types.GlobalCommandOptions, op
 			ocispecPlatforms = []ocispec.Platform{parsed} // no append
 		}
 
-		log.G(ctx).Infof("?Ensuring image %s %s", imageName, pullMode)
 		imgPullOpts := types.ImagePullOptions{
 			GOptions:        globalOptions,
 			OCISpecPlatform: ocispecPlatforms,

diff --git a/pkg/composer/up_service.go b/pkg/composer/up_service.go
@@ -116,7 +116,7 @@ func (c *Composer) ensureServiceImage(ctx context.Context, ps *serviceparser.Ser
 		log.G(ctx).Debugf("Image %s already exists, not building", ps.Image)
 	}
 
-	log.G(ctx).Infof("Ensuring image %s %s", ps.Image, pullModeArg)
+	log.G(ctx).Infof("Ensuring image %s", ps.Image)
 	if pullModeArg != "" {
 		return c.EnsureImage(ctx, ps.Image, pullModeArg, ps.Unparsed.Platform, ps, quiet)
 	}

diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go
@@ -557,7 +557,7 @@ func M(m *testing.M) {
 	flag.BoolVar(&flagTestKillDaemon, "test.allow-kill-daemon", false, "enable tests that kill the daemon")
 	flag.BoolVar(&flagTestIPv6, "test.only-ipv6", false, "enable tests on IPv6")
 	flag.BoolVar(&flagTestKube, "test.only-kubernetes", false, "enable tests on Kubernetes")
-	flag.BoolVar(&flagTestFlaky, "test.only-flaky", true, "enable testing of flaky tests only (if false, flaky tests are ignored)")
+	flag.BoolVar(&flagTestFlaky, "test.only-flaky", false, "enable testing of flaky tests only (if false, flaky tests are ignored)")
 	if flag.Lookup("test.v") != nil {
 		flagVerbose = true
 	}