update nerdctl to add all global options - dirty

coderbirju · coderbirju · commit 0f6c4be9db3a · 2025-11-02T02:32:28.000-08:00
Signed-off-by: Arjun Raja Yogidas &lt;arjunry@amazon.com&gt;
diff --git a/cmd/nerdctl/compose/compose_start.go b/cmd/nerdctl/compose/compose_start.go
@@ -114,7 +114,7 @@ func startContainers(ctx context.Context, client *containerd.Client, containers
 			}
 
 			// in compose, always disable attach
-			if err := containerutil.Start(ctx, c, false, false, client, "", "", (*config.Config)(globalOptions)); err != nil {
+			if err := containerutil.Start(ctx, c, false, false, client, "", "", (*config.Config)(globalOptions), options.NerdctlCmd, options.NerdctlArgs); err != nil {
 				return err
 			}
 			info, err := c.Info(ctx, containerd.WithoutRefreshedMetadata)
diff --git a/cmd/nerdctl/container/container_restart.go b/cmd/nerdctl/container/container_restart.go
@@ -48,6 +48,9 @@ func restartOptions(cmd *cobra.Command) (types.ContainerRestartOptions, error) {
 		return types.ContainerRestartOptions{}, err
 	}
 
+	// Call GlobalFlags function here
+	nerdctlCmd, nerdctlArgs := helpers.GlobalFlags(cmd)
+
 	var timeout *time.Duration
 	if cmd.Flags().Changed("time") {
 		// Seconds to wait for stop before killing it
@@ -74,6 +77,8 @@ func restartOptions(cmd *cobra.Command) (types.ContainerRestartOptions, error) {
 		GOption: globalOptions,
 		Timeout: timeout,
 		Signal:  signal,
+		NerdctlCmd: nerdctlCmd,
+		NerdctlArgs: nerdctlArgs,
 	}, err
 }
 
diff --git a/cmd/nerdctl/container/container_run.go b/cmd/nerdctl/container/container_run.go
@@ -457,7 +457,7 @@ func runAction(cmd *cobra.Command, args []string) error {
 	}
 
 	// Setup container healthchecks.
-	if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {
+	if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions), createOpt.NerdctlCmd, createOpt.nerdctlArgs); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)
 	}
 	if err := healthcheck.StartTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {
diff --git a/cmd/nerdctl/container/container_start.go b/cmd/nerdctl/container/container_start.go
@@ -91,6 +91,9 @@ func startAction(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	// call GlobalFlags( somewhere here
+	options.NerdctlCmd, options.NerdctlArgs := helpers.GlobalFlags(cmd)
+
 	client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), options.GOptions.Namespace, options.GOptions.Address)
 	if err != nil {
 		return err
diff --git a/pkg/api/types/container_types.go b/pkg/api/types/container_types.go
@@ -36,6 +36,10 @@ type ContainerStartOptions struct {
 	Checkpoint string
 	// CheckpointDir is the directory to store checkpoints
 	CheckpointDir string
+	// NerdctlCmd is the command name of nerdctl
+	NerdctlCmd string
+	// NerdctlArgs is the arguments of nerdctl
+	NerdctlArgs []string
 }
 
 // ContainerKillOptions specifies options for `nerdctl (container) kill`.
@@ -329,6 +333,10 @@ type ContainerRestartOptions struct {
 	Timeout *time.Duration
 	// Signal to send to stop the container, before sending SIGKILL
 	Signal string
+	// NerdctlCmd is the command name of nerdctl
+	NerdctlCmd string
+	// NerdctlArgs is the arguments of nerdctl
+	NerdctlArgs []string
 }
 
 // ContainerPauseOptions specifies options for `nerdctl (container) pause`.
diff --git a/pkg/cmd/container/restart.go b/pkg/cmd/container/restart.go
@@ -48,7 +48,9 @@ func Restart(ctx context.Context, client *containerd.Client, containers []string
 			if err := containerutil.Stop(ctx, found.Container, options.Timeout, options.Signal); err != nil {
 				return err
 			}
-			if err := containerutil.Start(ctx, found.Container, false, false, client, "", "", (*config.Config)(&options.GOption)); err != nil {
+			// ~ maybe just send the NerdctlCmd and NerdctlFlags array instead of the whole object, or maybe just send the whole object instead ~ 
+			// This has to be individual options as the Start function gets called by mutiple commands like compse, start and restart, each will have varying structs
+			if err := containerutil.Start(ctx, found.Container, false, false, client, "", "", (*config.Config)(&options.GOptions), options.NerdctlCmd, options.NerdctlArgs); err != nil {
 				return err
 			}
 			_, err = fmt.Fprintln(options.Stdout, found.Req)
diff --git a/pkg/cmd/container/start.go b/pkg/cmd/container/start.go
@@ -56,7 +56,9 @@ func Start(ctx context.Context, client *containerd.Client, reqs []string, option
 					return err
 				}
 			}
-			if err := containerutil.Start(ctx, found.Container, options.Attach, options.Interactive, client, options.DetachKeys, checkpointDir, (*config.Config)(&options.GOptions)); err != nil {
+			// ~ maybe just send the NerdctlCmd and NerdctlFlags array instead of the whole object, or maybe just send the whole object instead ~ 
+			// This has to be individual options as the Start function gets called by mutiple commands like compse, start and restart, each will have varying structs
+			if err := containerutil.Start(ctx, found.Container, options.Attach, options.Interactive, client, options.DetachKeys, checkpointDir, (*config.Config)(&options.GOptions), options.NerdctlCmd, options.NerdctlArgs); err != nil {
 				return err
 			}
 			if !options.Attach {
diff --git a/pkg/containerutil/containerutil.go b/pkg/containerutil/containerutil.go
@@ -206,7 +206,7 @@ func GenerateSharingPIDOpts(ctx context.Context, targetCon containerd.Container)
 }
 
 // Start starts `container` with `attach` flag. If `attach` is true, it will attach to the container's stdio.
-func Start(ctx context.Context, container containerd.Container, isAttach bool, isInteractive bool, client *containerd.Client, detachKeys string, checkpointDir string, cfg *config.Config) (err error) {
+func Start(ctx context.Context, container containerd.Container, isAttach bool, isInteractive bool, client *containerd.Client, detachKeys string, checkpointDir string, cfg *config.Config, NerdctlCmd string, NerdctlArgs []string) (err error) {	
 	// defer the storage of start error in the dedicated label
 	defer func() {
 		if err != nil {
diff --git a/pkg/healthcheck/healthcheck_manager_darwin.go b/pkg/healthcheck/healthcheck_manager_darwin.go
@@ -25,7 +25,7 @@ import (
 )
 
 // CreateTimer sets up the transient systemd timer and service for healthchecks.
-func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
+func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, NerdctlCmd string, NerdctlArgs []string) error {
 	return nil
 }
 
diff --git a/pkg/healthcheck/healthcheck_manager_freebsd.go b/pkg/healthcheck/healthcheck_manager_freebsd.go
@@ -25,7 +25,7 @@ import (
 )
 
 // CreateTimer sets up the transient systemd timer and service for healthchecks.
-func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
+func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, NerdctlCmd string, NerdctlArgs []string) error {
 	return nil
 }
 
diff --git a/pkg/healthcheck/healthcheck_manager_linux.go b/pkg/healthcheck/healthcheck_manager_linux.go
@@ -36,7 +36,7 @@ import (
 )
 
 // CreateTimer sets up the transient systemd timer and service for healthchecks.
-func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
+func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, NerdctlCmd string, NerdctlArgs []string) error {
 	hc := extractHealthcheck(ctx, container)
 	if hc == nil {
 		return nil
@@ -56,57 +56,14 @@ func CreateTimer(ctx context.Context, container containerd.Container, cfg *confi
 	// Always use health-interval for timer frequency
 	cmdOpts = append(cmdOpts, "--unit", containerID, "--on-unit-inactive="+hc.Interval.String(), "--timer-property=AccuracySec=1s")
 
-	// Get the full path to the current nerdctl binary
-	nerdctlPath, err := os.Executable()
-	if err != nil {
-		return fmt.Errorf("could not determine nerdctl executable path: %v", err)
-	}
 
 	cmdOpts = append(
-		cmdOpts, nerdctlPath,
-		"--namespace", cfg.Namespace,
-		"--address", cfg.Address,
-		"--data-root", cfg.DataRoot,
-		"--cni-path", cfg.CNIPath,
-		"--cni-netconfpath", cfg.CNINetConfPath,
-		"--cgroup-manager", cfg.CgroupManager,
-		"--host-gateway-ip", cfg.HostGatewayIP,
+		cmdOpts, 
+		NerdctlCmd,
+		NerdctlArgs,
 	)
-
-	// Add boolean flags
-	if cfg.InsecureRegistry {
-		cmdOpts = append(cmdOpts, "--insecure-registry")
-	}
-	if cfg.Experimental {
-		cmdOpts = append(cmdOpts, "--experimental")
-	}
-	if cfg.DebugFull {
-		cmdOpts = append(cmdOpts, "--debug-full")
-	}
-
-	// Add array flags
-	for _, dir := range cfg.HostsDir {
-		cmdOpts = append(cmdOpts, "--hosts-dir", dir)
-	}
-	for _, dir := range cfg.CDISpecDirs {
-		cmdOpts = append(cmdOpts, "--cdi-spec-dirs", dir)
-	}
-
-	// Add userns-remap if set
-	if cfg.UsernsRemap != "" {
-		cmdOpts = append(cmdOpts, "--userns-remap", cfg.UsernsRemap)
-	}
-
 	cmdOpts = append(cmdOpts, "container", "healthcheck", containerID)
 
-	if log.G(ctx).Logger.IsLevelEnabled(log.DebugLevel) {
-		cmdOpts = append(cmdOpts, "--debug")
-	}
-
-	if log.G(ctx).Logger.IsLevelEnabled(log.DebugLevel) {
-		cmdOpts = append(cmdOpts, "--debug")
-	}
-
 	log.G(ctx).Debugf("creating healthcheck timer with: systemd-run %s", strings.Join(cmdOpts, " "))
 	run := exec.Command("systemd-run", cmdOpts...)
 	if out, err := run.CombinedOutput(); err != nil {
diff --git a/pkg/healthcheck/healthcheck_manager_windows.go b/pkg/healthcheck/healthcheck_manager_windows.go
@@ -25,7 +25,7 @@ import (
 )
 
 // CreateTimer sets up the transient systemd timer and service for healthchecks.
-func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
+func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, NerdctlCmd string, NerdctlArgs []string) error {
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func startContainers(ctx context.Context, client *containerd.Client, containers`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`// in compose, always disable attach`
`117`		`- if err := containerutil.Start(ctx, c, false, false, client, "", "", (*config.Config)(globalOptions)); err != nil {`
	`117`	`+ if err := containerutil.Start(ctx, c, false, false, client, "", "", (*config.Config)(globalOptions), options.NerdctlCmd, options.NerdctlArgs); err != nil {`
`118`	`118`	`return err`
`119`	`119`	`}`
`120`	`120`	`info, err := c.Info(ctx, containerd.WithoutRefreshedMetadata)`
Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ func runAction(cmd *cobra.Command, args []string) error {`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`// Setup container healthchecks.`
`460`		`- if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {`
	`460`	`+ if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions), createOpt.NerdctlCmd, createOpt.nerdctlArgs); err != nil {`
`461`	`461`	`return fmt.Errorf("failed to create healthcheck timer: %w", err)`
`462`	`462`	`}`
`463`	`463`	`if err := healthcheck.StartTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,9 @@ func startAction(cmd *cobra.Command, args []string) error {`
`91`	`91`	`return err`
`92`	`92`	`}`
`93`	`93`
	`94`	`+ // call GlobalFlags( somewhere here`
	`95`	`+ options.NerdctlCmd, options.NerdctlArgs := helpers.GlobalFlags(cmd)`
	`96`	`+`
`94`	`97`	`client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), options.GOptions.Namespace, options.GOptions.Address)`
`95`	`98`	`if err != nil {`
`96`	`99`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ func Restart(ctx context.Context, client *containerd.Client, containers []string`
`48`	`48`	`if err := containerutil.Stop(ctx, found.Container, options.Timeout, options.Signal); err != nil {`
`49`	`49`	`return err`
`50`	`50`	`}`
`51`		`- if err := containerutil.Start(ctx, found.Container, false, false, client, "", "", (*config.Config)(&options.GOption)); err != nil {`
	`51`	`+ // ~ maybe just send the NerdctlCmd and NerdctlFlags array instead of the whole object, or maybe just send the whole object instead ~`
	`52`	`+ // This has to be individual options as the Start function gets called by mutiple commands like compse, start and restart, each will have varying structs`
	`53`	`+ if err := containerutil.Start(ctx, found.Container, false, false, client, "", "", (*config.Config)(&options.GOptions), options.NerdctlCmd, options.NerdctlArgs); err != nil {`
`52`	`54`	`return err`
`53`	`55`	`}`
`54`	`56`	`_, err = fmt.Fprintln(options.Stdout, found.Req)`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@ func Start(ctx context.Context, client *containerd.Client, reqs []string, option`
`56`	`56`	`return err`
`57`	`57`	`}`
`58`	`58`	`}`
`59`		`- if err := containerutil.Start(ctx, found.Container, options.Attach, options.Interactive, client, options.DetachKeys, checkpointDir, (*config.Config)(&options.GOptions)); err != nil {`
	`59`	`+ // ~ maybe just send the NerdctlCmd and NerdctlFlags array instead of the whole object, or maybe just send the whole object instead ~`
	`60`	`+ // This has to be individual options as the Start function gets called by mutiple commands like compse, start and restart, each will have varying structs`
	`61`	`+ if err := containerutil.Start(ctx, found.Container, options.Attach, options.Interactive, client, options.DetachKeys, checkpointDir, (*config.Config)(&options.GOptions), options.NerdctlCmd, options.NerdctlArgs); err != nil {`
`60`	`62`	`return err`
`61`	`63`	`}`
`62`	`64`	`if !options.Attach {`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ func GenerateSharingPIDOpts(ctx context.Context, targetCon containerd.Container)`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	// Start starts `container` with `attach` flag. If `attach` is true, it will attach to the container's stdio.
`209`		`-func Start(ctx context.Context, container containerd.Container, isAttach bool, isInteractive bool, client containerd.Client, detachKeys string, checkpointDir string, cfg config.Config) (err error) {`
	`209`	`+func Start(ctx context.Context, container containerd.Container, isAttach bool, isInteractive bool, client containerd.Client, detachKeys string, checkpointDir string, cfg config.Config, NerdctlCmd string, NerdctlArgs []string) (err error) {`
`210`	`210`	`// defer the storage of start error in the dedicated label`
`211`	`211`	`defer func() {`
`212`	`212`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// CreateTimer sets up the transient systemd timer and service for healthchecks.`
`28`		`-func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {`
	`28`	`+func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, NerdctlCmd string, NerdctlArgs []string) error {`
`29`	`29`	`return nil`
`30`	`30`	`}`
`31`	`31`