Add branch for platform-specific container opts

- Add empty setPlatformContainerOptions() function per platform Signed-off-by: Min Uk Lee <minuk.dev@gmail.com>
containerd · Oct 10, 2022 · 82e3d04 · 82e3d04
1 parent 8de12b9
commit 82e3d04
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/cmd/nerdctl/run.go b/cmd/nerdctl/run.go
@@ -669,6 +669,11 @@ func createContainer(cmd *cobra.Command, ctx context.Context, client *containerd
 	spec := containerd.WithSpec(&s, opts...)
 	cOpts = append(cOpts, spec)
 
+	cOpts, err = setPlatformContainerOptions(ctx, cOpts, cmd, client, id)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	container, err := client.NewContainer(ctx, id, cOpts...)
 	if err != nil {
 		gcContainer := func() {

diff --git a/cmd/nerdctl/run_freebsd.go b/cmd/nerdctl/run_freebsd.go
@@ -42,3 +42,7 @@ func runShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]s
 func setPlatformOptions(ctx context.Context, opts []oci.SpecOpts, cmd *cobra.Command, client *containerd.Client, id string) ([]oci.SpecOpts, error) {
 	return opts, nil
 }
+
+func setPlatformContainerOptions(ctx context.Context, cOpts []containerd.NewContainerOpts, cmd *cobra.Command, client *containerd.Client, id string) ([]containerd.NewContainerOpts, error) {
+	return cOpts, nil
+}
diff --git a/cmd/nerdctl/run_linux.go b/cmd/nerdctl/run_linux.go
@@ -189,6 +189,10 @@ func setPlatformOptions(ctx context.Context, opts []oci.SpecOpts, cmd *cobra.Com
 	return opts, nil
 }
 
+func setPlatformContainerOptions(ctx context.Context, cOpts []containerd.NewContainerOpts, cmd *cobra.Command, client *containerd.Client, id string) ([]containerd.NewContainerOpts, error) {
+	return cOpts, nil
+}
+
 func setOOMScoreAdj(opts []oci.SpecOpts, cmd *cobra.Command) ([]oci.SpecOpts, error) {
 	if !cmd.Flags().Changed("oom-score-adj") {
 		return opts, nil

diff --git a/cmd/nerdctl/run_windows.go b/cmd/nerdctl/run_windows.go
@@ -68,3 +68,7 @@ func setPlatformOptions(ctx context.Context, opts []oci.SpecOpts, cmd *cobra.Com
 
 	return opts, nil
 }
+
+func setPlatformContainerOptions(ctx context.Context, cOpts []containerd.NewContainerOpts, cmd *cobra.Command, client *containerd.Client, id string) ([]containerd.NewContainerOpts, error) {
+	return cOpts, nil
+}