Skip to content

Commit b06aab7

Browse files
AkihiroSudacrosbymichael
authored andcommitted
support using multiple snapshotters simultaneously
e.g. dist pull --snapshotter btrfs ...; ctr run --snapshotter btrfs ... (empty string defaults for overlayfs) Signed-off-by: Akihiro Suda <[email protected]> Signed-off-by: Michael Crosby <[email protected]>
1 parent 8f1c11d commit b06aab7

File tree

22 files changed

+741
-253
lines changed

22 files changed

+741
-253
lines changed

api/services/containers/v1/containers.pb.go

Lines changed: 99 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/services/containers/v1/containers.proto

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ message Container {
6565
// Spec to be used when creating the container. This is runtime specific.
6666
google.protobuf.Any spec = 5;
6767

68+
// Snapshotter specifies the snapshotter name used for rootfs
69+
string snapshotter = 6;
70+
6871
// RootFS specifies the snapshot key to use for the container's root
6972
// filesystem. When starting a task from this container, a caller should
7073
// look up the mounts from the snapshot service and include those on the
@@ -73,13 +76,13 @@ message Container {
7376
// Snapshots referenced in this field will not be garbage collected.
7477
//
7578
// This field may be updated.
76-
string rootfs = 6 [(gogoproto.customname) = "RootFS"];
79+
string rootfs = 7 [(gogoproto.customname) = "RootFS"];
7780

7881
// CreatedAt is the time the container was first created.
79-
google.protobuf.Timestamp created_at = 7 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
82+
google.protobuf.Timestamp created_at = 8 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
8083

8184
// UpdatedAt is the last time the container was mutated.
82-
google.protobuf.Timestamp updated_at = 8 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
85+
google.protobuf.Timestamp updated_at = 9 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
8386
}
8487

8588
message GetContainerRequest {

0 commit comments

Comments
 (0)