From ef48ef1e4c97a02a7d8654b886c745a6cc0c4e21 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Thu, 29 Oct 2020 15:21:37 +0000 Subject: [PATCH] add config path option to ctr for runtime Signed-off-by: Evan Hazlett --- cmd/ctr/commands/commands.go | 4 ++++ cmd/ctr/commands/run/run_unix.go | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/cmd/ctr/commands/commands.go b/cmd/ctr/commands/commands.go index 0d831f150..1208708e7 100644 --- a/cmd/ctr/commands/commands.go +++ b/cmd/ctr/commands/commands.go @@ -123,6 +123,10 @@ var ( Usage: "runtime name", Value: defaults.DefaultRuntime, }, + cli.StringFlag{ + Name: "runtime-config-path", + Usage: "optional runtime config path", + }, cli.BoolFlag{ Name: "tty,t", Usage: "allocate a TTY for the container", diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index 7ee1d9b2f..ef06288c6 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -30,6 +30,7 @@ import ( "github.com/containerd/containerd/contrib/nvidia" "github.com/containerd/containerd/contrib/seccomp" "github.com/containerd/containerd/oci" + crioptions "github.com/containerd/containerd/pkg/cri/runtimeoptions/v1" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/opencontainers/runtime-spec/specs-go" @@ -302,6 +303,12 @@ func getRuntimeOptions(context *cli.Context) (interface{}, error) { return getRuncOptions(context) } + if configPath := context.String("runtime-config-path"); configPath != "" { + return &crioptions.Options{ + ConfigPath: configPath, + }, nil + } + return nil, nil }