From 0ffc3e9873278bd59cd58c5a306d188633558790 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Wed, 1 Nov 2023 12:06:07 -0700 Subject: [PATCH] Handle ArgsEscaped for new Sb Server The PR https://github.com/containerd/containerd/pull/8198 fixed this for CRI but missed clearing the commandline in the forked SB server. This simply adds that back in Signed-off-by: James Sturtevant --- pkg/cri/server/container_execsync.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index cd9e31fc7..eb17981a7 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -146,6 +146,8 @@ func (c *criService) execInternal(ctx context.Context, container containerd.Cont } pspec.Args = opts.cmd + // CommandLine may already be set on the container's spec, but we want to only use Args here. + pspec.CommandLine = "" if opts.stdout == nil { opts.stdout = cio.NewDiscardLogger()