Prechádzať zdrojové kódy

Merge pull request #45435 from thaJeztah/c8d_import_argsescaped

daemon/containerd: containerConfigToOciImageConfig: add ArgsEscaped
Sebastiaan van Stijn 2 rokov pred
rodič
commit
8d375b44eb
1 zmenil súbory, kde vykonal 9 pridanie a 8 odobranie
  1. 9 8
      daemon/containerd/image_import.go

+ 9 - 8
daemon/containerd/image_import.go

@@ -383,14 +383,15 @@ func storeJson(ctx context.Context, cs content.Ingester, mt string, obj interfac
 
 func containerConfigToOciImageConfig(cfg *container.Config) ocispec.ImageConfig {
 	ociCfg := ocispec.ImageConfig{
-		User:       cfg.User,
-		Env:        cfg.Env,
-		Entrypoint: cfg.Entrypoint,
-		Cmd:        cfg.Cmd,
-		Volumes:    cfg.Volumes,
-		WorkingDir: cfg.WorkingDir,
-		Labels:     cfg.Labels,
-		StopSignal: cfg.StopSignal,
+		User:        cfg.User,
+		Env:         cfg.Env,
+		Entrypoint:  cfg.Entrypoint,
+		Cmd:         cfg.Cmd,
+		Volumes:     cfg.Volumes,
+		WorkingDir:  cfg.WorkingDir,
+		Labels:      cfg.Labels,
+		StopSignal:  cfg.StopSignal,
+		ArgsEscaped: cfg.ArgsEscaped,
 	}
 	for k, v := range cfg.ExposedPorts {
 		ociCfg.ExposedPorts[string(k)] = v