use config file instead of env variable

coderbirju · coderbirju · commit c2a14b0025c1 · 2025-09-18T23:40:27.000Z
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
@@ -28,8 +28,10 @@ import (
 	"github.com/containerd/errdefs"
 
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
+	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
+	"github.com/containerd/nerdctl/v2/pkg/config"
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
 	"github.com/containerd/nerdctl/v2/pkg/labels"
 )
@@ -86,15 +88,15 @@ func startAction(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf("service %q has no container to start", svcName)
 		}
 
-		if err := startContainers(ctx, client, containers); err != nil {
+		if err := startContainers(ctx, client, containers, &globalOptions); err != nil {
 			return err
 		}
 	}
 
 	return nil
 }
 
-func startContainers(ctx context.Context, client *containerd.Client, containers []containerd.Container) error {
+func startContainers(ctx context.Context, client *containerd.Client, containers []containerd.Container, globalOptions *types.GlobalCommandOptions) error {
 	eg, ctx := errgroup.WithContext(ctx)
 	for _, c := range containers {
 		c := c
@@ -112,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, ""); err != nil {
+			if err := containerutil.Start(ctx, c, false, false, client, "", (*config.Config)(globalOptions)); err != nil {
 				return err
 			}
 			info, err := c.Info(ctx, containerd.WithoutRefreshedMetadata)
diff --git a/cmd/nerdctl/container/container_run.go b/cmd/nerdctl/container/container_run.go
@@ -33,6 +33,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/container"
+	"github.com/containerd/nerdctl/v2/pkg/config"
 	"github.com/containerd/nerdctl/v2/pkg/consoleutil"
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
 	"github.com/containerd/nerdctl/v2/pkg/defaults"
@@ -446,10 +447,10 @@ func runAction(cmd *cobra.Command, args []string) error {
 	}
 
 	// Setup container healthchecks.
-	if err := healthcheck.CreateTimer(ctx, c); err != nil {
+	if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)
 	}
-	if err := healthcheck.StartTimer(ctx, c); err != nil {
+	if err := healthcheck.StartTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {
 		return fmt.Errorf("failed to start healthcheck timer: %w", err)
 	}
 
diff --git a/docs/healthchecks.md b/docs/healthchecks.md
@@ -55,7 +55,7 @@ On Linux systems with systemd, nerdctl automatically creates and manages systemd
 
 - systemd must be available on the system
 - Container must not be running in rootless mode
-- Environment variable `DISABLE_HC_SYSTEMD` must not be set to "true"
+- Configuration property `disable_hc_systemd` must not be set to `true` in nerdctl.toml
 
 ### How It Works
 
diff --git a/pkg/cmd/compose/compose.go b/pkg/cmd/compose/compose.go
@@ -33,6 +33,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/cmd/volume"
 	"github.com/containerd/nerdctl/v2/pkg/composer"
 	"github.com/containerd/nerdctl/v2/pkg/composer/serviceparser"
+	"github.com/containerd/nerdctl/v2/pkg/config"
 	"github.com/containerd/nerdctl/v2/pkg/imgutil"
 	"github.com/containerd/nerdctl/v2/pkg/internal/filesystem"
 	"github.com/containerd/nerdctl/v2/pkg/ipfs"
@@ -156,7 +157,7 @@ func New(client *containerd.Client, globalOptions types.GlobalCommandOptions, op
 		return err
 	}
 
-	return composer.New(options, client)
+	return composer.New(options, client, (*config.Config)(&globalOptions))
 }
 
 func imageVerifyOptionsFromCompose(ps *serviceparser.Service) types.ImageVerifyOptions {
diff --git a/pkg/cmd/container/restart.go b/pkg/cmd/container/restart.go
@@ -23,6 +23,7 @@ import (
 	containerd "github.com/containerd/containerd/v2/client"
 
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
+	"github.com/containerd/nerdctl/v2/pkg/config"
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
 	"github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker"
 )
@@ -38,7 +39,7 @@ 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, ""); err != nil {
+			if err := containerutil.Start(ctx, found.Container, false, false, client, "", (*config.Config)(&options.GOption)); 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
@@ -23,6 +23,7 @@ import (
 	containerd "github.com/containerd/containerd/v2/client"
 
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
+	"github.com/containerd/nerdctl/v2/pkg/config"
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
 	"github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker"
 )
@@ -40,7 +41,7 @@ func Start(ctx context.Context, client *containerd.Client, reqs []string, option
 			if found.MatchCount > 1 {
 				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
 			}
-			if err := containerutil.Start(ctx, found.Container, options.Attach, options.Interactive, client, options.DetachKeys); err != nil {
+			if err := containerutil.Start(ctx, found.Container, options.Attach, options.Interactive, client, options.DetachKeys, (*config.Config)(&options.GOptions)); err != nil {
 				return err
 			}
 			if !options.Attach {
diff --git a/pkg/cmd/container/unpause.go b/pkg/cmd/container/unpause.go
@@ -23,6 +23,7 @@ import (
 	containerd "github.com/containerd/containerd/v2/client"
 
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
+	"github.com/containerd/nerdctl/v2/pkg/config"
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
 	"github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker"
 )
@@ -35,7 +36,7 @@ func Unpause(ctx context.Context, client *containerd.Client, reqs []string, opti
 			if found.MatchCount > 1 {
 				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
 			}
-			if err := containerutil.Unpause(ctx, client, found.Container.ID()); err != nil {
+			if err := containerutil.Unpause(ctx, client, found.Container.ID(), (*config.Config)(&options.GOptions)); err != nil {
 				return err
 			}
 
diff --git a/pkg/composer/composer.go b/pkg/composer/composer.go
@@ -30,6 +30,7 @@ import (
 	"github.com/containerd/log"
 
 	"github.com/containerd/nerdctl/v2/pkg/composer/serviceparser"
+	"github.com/containerd/nerdctl/v2/pkg/config"
 	"github.com/containerd/nerdctl/v2/pkg/identifiers"
 	"github.com/containerd/nerdctl/v2/pkg/reflectutil"
 )
@@ -54,7 +55,7 @@ type Options struct {
 	IPFSAddress      string
 }
 
-func New(o Options, client *containerd.Client) (*Composer, error) {
+func New(o Options, client *containerd.Client, cfg *config.Config) (*Composer, error) {
 	if o.NerdctlCmd == "" {
 		return nil, errors.New("got empty nerdctl cmd")
 	}
@@ -119,6 +120,7 @@ func New(o Options, client *containerd.Client) (*Composer, error) {
 		Options: o,
 		project: project,
 		client:  client,
+		config:  cfg,
 	}
 
 	return c, nil
@@ -128,6 +130,7 @@ type Composer struct {
 	Options
 	project *compose.Project
 	client  *containerd.Client
+	config  *config.Config
 }
 
 func (c *Composer) createNerdctlCmd(ctx context.Context, args ...string) *exec.Cmd {
diff --git a/pkg/composer/pause.go b/pkg/composer/pause.go
@@ -83,7 +83,7 @@ func (c *Composer) Unpause(ctx context.Context, services []string, writer io.Wri
 	for _, container := range containers {
 		container := container
 		eg.Go(func() error {
-			if err := containerutil.Unpause(ctx, c.client, container.ID()); err != nil {
+			if err := containerutil.Unpause(ctx, c.client, container.ID(), c.config); err != nil {
 				return err
 			}
 			info, err := container.Info(ctx, containerd.WithoutRefreshedMetadata)
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -46,6 +46,7 @@ type Config struct {
 	DNS              []string `toml:"dns,omitempty"`
 	DNSOpts          []string `toml:"dns_opts,omitempty"`
 	DNSSearch        []string `toml:"dns_search,omitempty"`
+	DisableHCSystemd bool     `toml:"disable_hc_systemd"`
 }
 
 // New creates a default Config object statically,
@@ -71,5 +72,6 @@ func New() *Config {
 		DNS:              []string{},
 		DNSOpts:          []string{},
 		DNSSearch:        []string{},
+		DisableHCSystemd: false,
 	}
 }
diff --git a/pkg/containerutil/containerutil.go b/pkg/containerutil/containerutil.go
@@ -45,6 +45,7 @@ import (
 	"github.com/containerd/go-cni"
 	"github.com/containerd/log"
 
+	"github.com/containerd/nerdctl/v2/pkg/config"
 	"github.com/containerd/nerdctl/v2/pkg/consoleutil"
 	"github.com/containerd/nerdctl/v2/pkg/errutil"
 	"github.com/containerd/nerdctl/v2/pkg/formatter"
@@ -205,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) (err error) {
+func Start(ctx context.Context, container containerd.Container, isAttach bool, isInteractive bool, client *containerd.Client, detachKeys string, cfg *config.Config) (err error) {
 	// defer the storage of start error in the dedicated label
 	defer func() {
 		if err != nil {
@@ -289,10 +290,10 @@ func Start(ctx context.Context, container containerd.Container, isAttach bool, i
 	}
 
 	// If container has health checks configured, create and start systemd timer/service files.
-	if err := healthcheck.CreateTimer(ctx, container); err != nil {
+	if err := healthcheck.CreateTimer(ctx, container, cfg); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)
 	}
-	if err := healthcheck.StartTimer(ctx, container); err != nil {
+	if err := healthcheck.StartTimer(ctx, container, cfg); err != nil {
 		return fmt.Errorf("failed to start healthcheck timer: %w", err)
 	}
 
@@ -511,7 +512,7 @@ func Pause(ctx context.Context, client *containerd.Client, id string) error {
 }
 
 // Unpause unpauses a container by its id.
-func Unpause(ctx context.Context, client *containerd.Client, id string) error {
+func Unpause(ctx context.Context, client *containerd.Client, id string, cfg *config.Config) error {
 	container, err := client.LoadContainer(ctx, id)
 	if err != nil {
 		return err
@@ -528,10 +529,10 @@ func Unpause(ctx context.Context, client *containerd.Client, id string) error {
 	}
 
 	// Recreate healthcheck related systemd timer/service files.
-	if err := healthcheck.CreateTimer(ctx, container); err != nil {
+	if err := healthcheck.CreateTimer(ctx, container, cfg); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)
 	}
-	if err := healthcheck.StartTimer(ctx, container); err != nil {
+	if err := healthcheck.StartTimer(ctx, container, cfg); err != nil {
 		return fmt.Errorf("failed to start healthcheck timer: %w", err)
 	}
 
diff --git a/pkg/healthcheck/healthcheck_manager_linux.go b/pkg/healthcheck/healthcheck_manager_linux.go
@@ -19,7 +19,6 @@ package healthcheck
 import (
 	"context"
 	"fmt"
-	"math/rand"
 	"os"
 	"os/exec"
 	"strings"
@@ -30,40 +29,40 @@ import (
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/log"
 
+	"github.com/containerd/nerdctl/v2/pkg/config"
 	"github.com/containerd/nerdctl/v2/pkg/defaults"
 	"github.com/containerd/nerdctl/v2/pkg/labels"
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 )
 
 // CreateTimer sets up the transient systemd timer and service for healthchecks.
-func CreateTimer(ctx context.Context, container containerd.Container) error {
+func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
 	hc := extractHealthcheck(ctx, container)
 	if hc == nil {
 		return nil
 	}
-	if shouldSkipHealthCheckSystemd(hc) {
+	if shouldSkipHealthCheckSystemd(hc, cfg) {
 		return nil
 	}
 
 	containerID := container.ID()
-	hcName := hcUnitName(containerID, true)
-	log.G(ctx).Debugf("Creating healthcheck timer unit: %s", hcName)
+	log.G(ctx).Debugf("Creating healthcheck timer unit: %s", containerID)
 
-	cmd := []string{}
+	cmdOpts := []string{}
 	if path := os.Getenv("PATH"); path != "" {
-		cmd = append(cmd, "--setenv=PATH="+path)
+		cmdOpts = append(cmdOpts, "--setenv=PATH="+path)
 	}
 
 	// Always use health-interval for timer frequency
-	cmd = append(cmd, "--unit", hcName, "--on-unit-inactive="+hc.Interval.String(), "--timer-property=AccuracySec=1s")
+	cmdOpts = append(cmdOpts, "--unit", containerID, "--on-unit-inactive="+hc.Interval.String(), "--timer-property=AccuracySec=1s")
 
-	cmd = append(cmd, "nerdctl", "container", "healthcheck", containerID)
+	cmdOpts = append(cmdOpts, "nerdctl", "container", "healthcheck", containerID)
 	if log.G(ctx).Logger.IsLevelEnabled(log.DebugLevel) {
-		cmd = append(cmd, "--debug")
+		cmdOpts = append(cmdOpts, "--debug")
 	}
 
-	log.G(ctx).Debugf("creating healthcheck timer with: systemd-run %s", strings.Join(cmd, " "))
-	run := exec.Command("systemd-run", cmd...)
+	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 {
 		return fmt.Errorf("systemd-run failed: %w\noutput: %s", err, strings.TrimSpace(string(out)))
 	}
@@ -72,16 +71,16 @@ func CreateTimer(ctx context.Context, container containerd.Container) error {
 }
 
 // StartTimer starts the healthcheck timer unit.
-func StartTimer(ctx context.Context, container containerd.Container) error {
+func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
 	hc := extractHealthcheck(ctx, container)
 	if hc == nil {
 		return nil
 	}
-	if shouldSkipHealthCheckSystemd(hc) {
+	if shouldSkipHealthCheckSystemd(hc, cfg) {
 		return nil
 	}
 
-	hcName := hcUnitName(container.ID(), true)
+	containerID := container.ID()
 	var conn *dbus.Conn
 	var err error
 	if rootlessutil.IsRootless() {
@@ -95,7 +94,7 @@ func StartTimer(ctx context.Context, container containerd.Container) error {
 	defer conn.Close()
 
 	startChan := make(chan string)
-	unit := hcName + ".service"
+	unit := containerID + ".service"
 	if _, err := conn.RestartUnitContext(context.Background(), unit, "fail", startChan); err != nil {
 		return err
 	}
@@ -125,9 +124,8 @@ func ForceRemoveTransientHealthCheckFiles(ctx context.Context, containerID strin
 	timeoutCtx, cancel := context.WithTimeout(ctx, 3*time.Second)
 	defer cancel()
 
-	unitName := hcUnitName(containerID, true)
-	timer := unitName + ".timer"
-	service := unitName + ".service"
+	timer := containerID + ".timer"
+	service := containerID + ".service"
 
 	// Channel to collect any critical errors (though we'll continue cleanup regardless)
 	errChan := make(chan error, 3)
@@ -234,14 +232,6 @@ func ForceRemoveTransientHealthCheckFiles(ctx context.Context, containerID strin
 	return nil
 }
 
-// hcUnitName returns a systemd unit name for a container healthcheck.
-func hcUnitName(containerID string, bare bool) string {
-	unit := containerID
-	if !bare {
-		unit += fmt.Sprintf("-%x", rand.Int())
-	}
-	return unit
-}
 
 func extractHealthcheck(ctx context.Context, container containerd.Container) *Healthcheck {
 	l, err := container.Labels(ctx)
@@ -262,9 +252,9 @@ func extractHealthcheck(ctx context.Context, container containerd.Container) *He
 }
 
 // shouldSkipHealthCheckSystemd determines if healthcheck timers should be skipped.
-func shouldSkipHealthCheckSystemd(hc *Healthcheck) bool {
+func shouldSkipHealthCheckSystemd(hc *Healthcheck, cfg *config.Config) bool {
 	// Don't proceed if systemd is unavailable or disabled
-	if !defaults.IsSystemdAvailable() || os.Getenv("DISABLE_HC_SYSTEMD") == "true" || rootlessutil.IsRootless() {
+	if !defaults.IsSystemdAvailable() || cfg.DisableHCSystemd || rootlessutil.IsRootless() {
 		return true
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,10 @@ import (`
`28`	`28`	`"github.com/containerd/errdefs"`
`29`	`29`
`30`	`30`	`"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"`
	`31`	`+ "github.com/containerd/nerdctl/v2/pkg/api/types"`
`31`	`32`	`"github.com/containerd/nerdctl/v2/pkg/clientutil"`
`32`	`33`	`"github.com/containerd/nerdctl/v2/pkg/cmd/compose"`
	`34`	`+ "github.com/containerd/nerdctl/v2/pkg/config"`
`33`	`35`	`"github.com/containerd/nerdctl/v2/pkg/containerutil"`
`34`	`36`	`"github.com/containerd/nerdctl/v2/pkg/labels"`
`35`	`37`	`)`
`@@ -86,15 +88,15 @@ func startAction(cmd *cobra.Command, args []string) error {`
`86`	`88`	`return fmt.Errorf("service %q has no container to start", svcName)`
`87`	`89`	`}`
`88`	`90`
`89`		`- if err := startContainers(ctx, client, containers); err != nil {`
	`91`	`+ if err := startContainers(ctx, client, containers, &globalOptions); err != nil {`
`90`	`92`	`return err`
`91`	`93`	`}`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`return nil`
`95`	`97`	`}`
`96`	`98`
`97`		`-func startContainers(ctx context.Context, client *containerd.Client, containers []containerd.Container) error {`
	`99`	`+func startContainers(ctx context.Context, client containerd.Client, containers []containerd.Container, globalOptions types.GlobalCommandOptions) error {`
`98`	`100`	`eg, ctx := errgroup.WithContext(ctx)`
`99`	`101`	`for _, c := range containers {`
`100`	`102`	`c := c`
`@@ -112,7 +114,7 @@ func startContainers(ctx context.Context, client *containerd.Client, containers`
`112`	`114`	`}`
`113`	`115`
`114`	`116`	`// in compose, always disable attach`
`115`		`- if err := containerutil.Start(ctx, c, false, false, client, ""); err != nil {`
	`117`	`+ if err := containerutil.Start(ctx, c, false, false, client, "", (*config.Config)(globalOptions)); err != nil {`
`116`	`118`	`return err`
`117`	`119`	`}`
`118`	`120`	`info, err := c.Info(ctx, containerd.WithoutRefreshedMetadata)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ import (`
`33`	`33`	`"github.com/containerd/nerdctl/v2/pkg/api/types"`
`34`	`34`	`"github.com/containerd/nerdctl/v2/pkg/clientutil"`
`35`	`35`	`"github.com/containerd/nerdctl/v2/pkg/cmd/container"`
	`36`	`+ "github.com/containerd/nerdctl/v2/pkg/config"`
`36`	`37`	`"github.com/containerd/nerdctl/v2/pkg/consoleutil"`
`37`	`38`	`"github.com/containerd/nerdctl/v2/pkg/containerutil"`
`38`	`39`	`"github.com/containerd/nerdctl/v2/pkg/defaults"`
`@@ -446,10 +447,10 @@ func runAction(cmd *cobra.Command, args []string) error {`
`446`	`447`	`}`
`447`	`448`
`448`	`449`	`// Setup container healthchecks.`
`449`		`- if err := healthcheck.CreateTimer(ctx, c); err != nil {`
	`450`	`+ if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {`
`450`	`451`	`return fmt.Errorf("failed to create healthcheck timer: %w", err)`
`451`	`452`	`}`
`452`		`- if err := healthcheck.StartTimer(ctx, c); err != nil {`
	`453`	`+ if err := healthcheck.StartTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {`
`453`	`454`	`return fmt.Errorf("failed to start healthcheck timer: %w", err)`
`454`	`455`	`}`
`455`	`456`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`	`containerd "github.com/containerd/containerd/v2/client"`
`24`	`24`
`25`	`25`	`"github.com/containerd/nerdctl/v2/pkg/api/types"`
	`26`	`+ "github.com/containerd/nerdctl/v2/pkg/config"`
`26`	`27`	`"github.com/containerd/nerdctl/v2/pkg/containerutil"`
`27`	`28`	`"github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker"`
`28`	`29`	`)`
`@@ -38,7 +39,7 @@ func Restart(ctx context.Context, client *containerd.Client, containers []string`
`38`	`39`	`if err := containerutil.Stop(ctx, found.Container, options.Timeout, options.Signal); err != nil {`
`39`	`40`	`return err`
`40`	`41`	`}`
`41`		`- if err := containerutil.Start(ctx, found.Container, false, false, client, ""); err != nil {`
	`42`	`+ if err := containerutil.Start(ctx, found.Container, false, false, client, "", (*config.Config)(&options.GOption)); err != nil {`
`42`	`43`	`return err`
`43`	`44`	`}`
`44`	`45`	`_, err := fmt.Fprintln(options.Stdout, found.Req)`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ import (`
`30`	`30`	`"github.com/containerd/log"`
`31`	`31`
`32`	`32`	`"github.com/containerd/nerdctl/v2/pkg/composer/serviceparser"`
	`33`	`+ "github.com/containerd/nerdctl/v2/pkg/config"`
`33`	`34`	`"github.com/containerd/nerdctl/v2/pkg/identifiers"`
`34`	`35`	`"github.com/containerd/nerdctl/v2/pkg/reflectutil"`
`35`	`36`	`)`
`@@ -54,7 +55,7 @@ type Options struct {`
`54`	`55`	`IPFSAddress string`
`55`	`56`	`}`
`56`	`57`
`57`		`-func New(o Options, client containerd.Client) (Composer, error) {`
	`58`	`+func New(o Options, client containerd.Client, cfg config.Config) (*Composer, error) {`
`58`	`59`	`if o.NerdctlCmd == "" {`
`59`	`60`	`return nil, errors.New("got empty nerdctl cmd")`
`60`	`61`	`}`
`@@ -119,6 +120,7 @@ func New(o Options, client containerd.Client) (Composer, error) {`
`119`	`120`	`Options: o,`
`120`	`121`	`project: project,`
`121`	`122`	`client: client,`
	`123`	`+ config: cfg,`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`return c, nil`
`@@ -128,6 +130,7 @@ type Composer struct {`
`128`	`130`	`Options`
`129`	`131`	`project *compose.Project`
`130`	`132`	`client *containerd.Client`
	`133`	`+ config *config.Config`
`131`	`134`	`}`
`132`	`135`
`133`	`136`	`func (c Composer) createNerdctlCmd(ctx context.Context, args ...string) exec.Cmd {`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (c *Composer) Unpause(ctx context.Context, services []string, writer io.Wri`
`83`	`83`	`for _, container := range containers {`
`84`	`84`	`container := container`
`85`	`85`	`eg.Go(func() error {`
`86`		`- if err := containerutil.Unpause(ctx, c.client, container.ID()); err != nil {`
	`86`	`+ if err := containerutil.Unpause(ctx, c.client, container.ID(), c.config); err != nil {`
`87`	`87`	`return err`
`88`	`88`	`}`
`89`	`89`	`info, err := container.Info(ctx, containerd.WithoutRefreshedMetadata)`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ type Config struct {`
`46`	`46`	DNS []string `toml:"dns,omitempty"`
`47`	`47`	DNSOpts []string `toml:"dns_opts,omitempty"`
`48`	`48`	DNSSearch []string `toml:"dns_search,omitempty"`
	`49`	+ DisableHCSystemd bool `toml:"disable_hc_systemd"`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`// New creates a default Config object statically,`
`@@ -71,5 +72,6 @@ func New() *Config {`
`71`	`72`	`DNS: []string{},`
`72`	`73`	`DNSOpts: []string{},`
`73`	`74`	`DNSSearch: []string{},`
	`75`	`+ DisableHCSystemd: false,`
`74`	`76`	`}`
`75`	`77`	`}`