From e510abbc8ce21446131749cef476df1796edacde Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 29 Apr 2023 00:20:07 +0200 Subject: [PATCH] daemon/containerd: containerConfigToOciImageConfig: add ArgsEscaped The OCI image-spec now also provides ArgsEscaped for backward compatibility with the option used by Docker. Signed-off-by: Sebastiaan van Stijn --- daemon/containerd/image_import.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/daemon/containerd/image_import.go b/daemon/containerd/image_import.go index 592c7f294e..27b8b9ebea 100644 --- a/daemon/containerd/image_import.go +++ b/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