merge top layer if need

cmd/nerdctl/container/container_commit.go

@@ -51,6 +51,7 @@ func CommitCommand() *cobra.Command {
 	cmd.Flags().Bool("zstdchunked", false, "Convert the committed layer to zstd:chunked for lazy pulling")
 	cmd.Flags().Int("zstdchunked-compression-level", 3, "zstd:chunked compression level")
 	cmd.Flags().Int("zstdchunked-chunk-size", 0, "zstd:chunked chunk size")
+	cmd.Flags().Bool("devbox-remove-layer", false, "Remove the top layer of the base image when committing a devbox container")
 	return cmd
 }
 
@@ -128,6 +129,11 @@ func commitOptions(cmd *cobra.Command) (types.ContainerCommitOptions, error) {
 		return types.ContainerCommitOptions{}, errors.New("options --estargz and --zstdchunked lead to conflict, only one of them can be used")
 	}
 
+	removeBaseImageTopLayer, err := cmd.Flags().GetBool("devbox-remove-layer")
+	if err != nil {
+		return types.ContainerCommitOptions{}, err
+	}
+
 	return types.ContainerCommitOptions{
 		Stdout:      cmd.OutOrStdout(),
 		GOptions:    globalOptions,
@@ -148,6 +154,9 @@ func commitOptions(cmd *cobra.Command) (types.ContainerCommitOptions, error) {
 			ZstdChunkedCompressionLevel: zstdchunkedCompressionLevel,
 			ZstdChunkedChunkSize:        zstdchunkedChunkSize,
 		},
+		DevboxOptions: types.DevboxOptions{
+			RemoveBaseImageTopLayer: removeBaseImageTopLayer,
+		},
 	}, nil
 }
 

cmd/nerdctl/container/container_create.go

@@ -19,6 +19,7 @@ package container
 import (
 	"fmt"
 	"runtime"
+	"strings"
 
 	"github.com/spf13/cobra"
 	cdiparser "tags.cncf.io/container-device-interface/pkg/parser"
@@ -417,6 +418,23 @@ func createOptions(cmd *cobra.Command) (types.ContainerCreateOptions, error) {
 	if err != nil {
 		return opt, err
 	}
+
+	// Parse snapshot labels
+	snapshotLabels, err := cmd.Flags().GetStringArray("snapshot-label")
+	if err != nil {
+		return opt, err
+	}
+	if len(snapshotLabels) > 0 {
+		opt.SnapshotLabels = make(map[string]string)
+		for _, label := range snapshotLabels {
+			if key, value, ok := strings.Cut(label, "="); ok {
+				opt.SnapshotLabels[key] = value
+			} else {
+				opt.SnapshotLabels[label] = ""
+			}
+		}
+	}
+
 	opt.Annotations, err = cmd.Flags().GetStringArray("annotation")
 	if err != nil {
 		return opt, err

cmd/nerdctl/container/container_run.go

@@ -260,6 +260,8 @@ func setCreateFlags(cmd *cobra.Command) {
 	cmd.Flags().String("name", "", "Assign a name to the container")
 	// label needs to be StringArray, not StringSlice, to prevent "foo=foo1,foo2" from being split to {"foo=foo1", "foo2"}
 	cmd.Flags().StringArrayP("label", "l", nil, "Set metadata on container")
+	// snapshot-label needs to be StringArray, not StringSlice, to prevent "foo=foo1,foo2" from being split to {"foo=foo1", "foo2"}
+	cmd.Flags().StringArray("snapshot-label", nil, "Set metadata on snapshot")
 	// annotation needs to be StringArray, not StringSlice, to prevent "foo=foo1,foo2" from being split to {"foo=foo1", "foo2"}
 	cmd.Flags().StringArray("annotation", nil, "Add an annotation to the container (passed through to the OCI runtime)")
 	cmd.RegisterFlagCompletionFunc("annotation", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {

cmd/nerdctl/main.go

@@ -42,6 +42,7 @@ import (
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/login"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/namespace"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/network"
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/snapshot"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/system"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/volume"
 	"github.com/containerd/nerdctl/v2/pkg/config"
@@ -328,6 +329,7 @@ Config file ($NERDCTL_TOML): %s
 		system.Command(),
 		namespace.Command(),
 		builder.Command(),
+		snapshot.Command(),
 		// #endregion
 
 		// Internal

cmd/nerdctl/snapshot/snapshot.go

@@ -0,0 +1,40 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package snapshot
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
+)
+
+func Command() *cobra.Command {
+	cmd := &cobra.Command{
+		Annotations:   map[string]string{helpers.Category: helpers.Management},
+		Use:           "snapshot",
+		Short:         "Manage snapshots",
+		RunE:          helpers.UnknownSubcommandAction,
+		SilenceUsage:  true,
+		SilenceErrors: true,
+	}
+	cmd.AddCommand(
+		InfoCommand(),
+		ListCommand(),
+		UpdateCommand(),
+	)
+	return cmd
+}

cmd/nerdctl/snapshot/snapshot_info.go

@@ -0,0 +1,79 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package snapshot
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/completion"
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
+	"github.com/containerd/nerdctl/v2/pkg/api/types"
+	"github.com/containerd/nerdctl/v2/pkg/clientutil"
+	"github.com/containerd/nerdctl/v2/pkg/cmd/snapshot"
+)
+
+func InfoCommand() *cobra.Command {
+	var cmd = &cobra.Command{
+		Use:               "info [flags] SNAPSHOT_ID",
+		Short:             "Get detailed information about a snapshot",
+		Args:              helpers.IsExactArgs(1),
+		RunE:              infoAction,
+		ValidArgsFunction: infoShellComplete,
+		SilenceUsage:      true,
+		SilenceErrors:     true,
+	}
+	cmd.Flags().StringP("snapshotter", "", "", "Snapshotter name (default: auto-detect)")
+	cmd.RegisterFlagCompletionFunc("snapshotter", completion.SnapshotterNames)
+	return cmd
+}
+
+func infoOptions(cmd *cobra.Command) (types.SnapshotInfoOptions, error) {
+	globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
+	if err != nil {
+		return types.SnapshotInfoOptions{}, err
+	}
+
+	snapshotter, err := cmd.Flags().GetString("snapshotter")
+	if err != nil {
+		return types.SnapshotInfoOptions{}, err
+	}
+
+	return types.SnapshotInfoOptions{
+		Stdout:      cmd.OutOrStdout(),
+		GOptions:    globalOptions,
+		Snapshotter: snapshotter,
+	}, nil
+}
+
+func infoAction(cmd *cobra.Command, args []string) error {
+	options, err := infoOptions(cmd)
+	if err != nil {
+		return err
+	}
+	client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), options.GOptions.Namespace, options.GOptions.Address)
+	if err != nil {
+		return err
+	}
+	defer cancel()
+
+	return snapshot.Info(ctx, client, args[0], options)
+}
+
+func infoShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	// TODO: We could potentially add snapshot ID completion here in the future
+	return nil, cobra.ShellCompDirectiveNoFileComp
+}

cmd/nerdctl/snapshot/snapshot_list.go

@@ -0,0 +1,74 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package snapshot
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/completion"
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
+	"github.com/containerd/nerdctl/v2/pkg/api/types"
+	"github.com/containerd/nerdctl/v2/pkg/clientutil"
+	"github.com/containerd/nerdctl/v2/pkg/cmd/snapshot"
+)
+
+func ListCommand() *cobra.Command {
+	var cmd = &cobra.Command{
+		Use:           "list [flags]",
+		Short:         "List snapshots",
+		Aliases:       []string{"ls"},
+		Args:          helpers.IsExactArgs(0),
+		RunE:          listAction,
+		SilenceUsage:  true,
+		SilenceErrors: true,
+	}
+	cmd.Flags().StringP("snapshotter", "", "", "Snapshotter name (default: auto-detect)")
+	cmd.RegisterFlagCompletionFunc("snapshotter", completion.SnapshotterNames)
+	return cmd
+}
+
+func listOptions(cmd *cobra.Command) (types.SnapshotListOptions, error) {
+	globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
+	if err != nil {
+		return types.SnapshotListOptions{}, err
+	}
+
+	snapshotter, err := cmd.Flags().GetString("snapshotter")
+	if err != nil {
+		return types.SnapshotListOptions{}, err
+	}
+
+	return types.SnapshotListOptions{
+		Stdout:      cmd.OutOrStdout(),
+		GOptions:    globalOptions,
+		Snapshotter: snapshotter,
+	}, nil
+}
+
+func listAction(cmd *cobra.Command, args []string) error {
+	options, err := listOptions(cmd)
+	if err != nil {
+		return err
+	}
+	client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), options.GOptions.Namespace, options.GOptions.Address)
+	if err != nil {
+		return err
+	}
+	defer cancel()
+
+	return snapshot.List(ctx, client, options)
+}

cmd/nerdctl/snapshot/snapshot_update.go

@@ -0,0 +1,81 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package snapshot
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/completion"
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
+	"github.com/containerd/nerdctl/v2/pkg/api/types"
+	"github.com/containerd/nerdctl/v2/pkg/clientutil"
+	"github.com/containerd/nerdctl/v2/pkg/cmd/snapshot"
+)
+
+func UpdateCommand() *cobra.Command {
+	var cmd = &cobra.Command{
+		Use:               "update [flags] SNAPSHOT_ID [LABEL=VALUE...]",
+		Short:             "Update snapshot metadata",
+		Args:              cobra.MinimumNArgs(1),
+		RunE:              updateAction,
+		ValidArgsFunction: updateShellComplete,
+		SilenceUsage:      true,
+		SilenceErrors:     true,
+	}
+	cmd.Flags().StringP("snapshotter", "", "", "Snapshotter name (default: auto-detect)")
+	cmd.RegisterFlagCompletionFunc("snapshotter", completion.SnapshotterNames)
+	return cmd
+}
+
+func updateOptions(cmd *cobra.Command) (types.SnapshotUpdateOptions, error) {
+	globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
+	if err != nil {
+		return types.SnapshotUpdateOptions{}, err
+	}
+
+	snapshotter, err := cmd.Flags().GetString("snapshotter")
+	if err != nil {
+		return types.SnapshotUpdateOptions{}, err
+	}
+
+	return types.SnapshotUpdateOptions{
+		Stdout:      cmd.OutOrStdout(),
+		GOptions:    globalOptions,
+		Snapshotter: snapshotter,
+	}, nil
+}
+
+func updateAction(cmd *cobra.Command, args []string) error {
+	options, err := updateOptions(cmd)
+	if err != nil {
+		return err
+	}
+	client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), options.GOptions.Namespace, options.GOptions.Address)
+	if err != nil {
+		return err
+	}
+	defer cancel()
+
+	snapshotID := args[0]
+	labels := args[1:]
+	return snapshot.Update(ctx, client, snapshotID, labels, options)
+}
+
+func updateShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	// TODO: We could potentially add snapshot ID completion here in the future
+	return nil, cobra.ShellCompDirectiveNoFileComp
+}

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/containerd/cgroups/v3 v3.0.5 //gomodjail:unconfined
 	github.com/containerd/console v1.0.5 //gomodjail:unconfined
 	github.com/containerd/containerd/api v1.9.0
-	github.com/containerd/containerd/v2 v2.1.3 //gomodjail:unconfined
+	github.com/containerd/containerd/v2 v2.1.4 //gomodjail:unconfined
 	github.com/containerd/continuity v0.4.5 //gomodjail:unconfined
 	github.com/containerd/errdefs v1.0.0
 	github.com/containerd/fifo v1.1.0 //gomodjail:unconfined
@@ -40,7 +40,7 @@ require (
 	github.com/fatih/color v1.18.0 //gomodjail:unconfined
 	github.com/fluent/fluent-logger-golang v1.10.0
 	github.com/fsnotify/fsnotify v1.9.0 //gomodjail:unconfined
-	github.com/go-viper/mapstructure/v2 v2.3.0
+	github.com/go-viper/mapstructure/v2 v2.4.0
 	github.com/ipfs/go-cid v0.5.0
 	github.com/klauspost/compress v1.18.0
 	github.com/mattn/go-isatty v0.0.20 //gomodjail:unconfined