Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opencontainers/runc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0be834ffca80445679adc3671ceb5889ff9575d3
Choose a base ref
..
head repository: opencontainers/runc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7098a811f72794bbd7c257ca10dac90416284be9
Choose a head ref
Showing with 9 additions and 15 deletions.
  1. +3 −5 features.go
  2. +6 −10 types/features/features.go
8 changes: 3 additions & 5 deletions features.go
View file
Original file line number Diff line number Diff line change
@@ -28,8 +28,9 @@ var featuresCommand = cli.Command{

feat := features.Features{
Annotations: map[string]string{
features.AnnotationRuncVersion: version,
features.AnnotationRuncCommit: gitCommit,
features.AnnotationRuncVersion: version,
features.AnnotationRuncCommit: gitCommit,
features.AnnotationRuncCheckpointEnabled: "true",
},
Cgroup: features.Cgroup{
V1: &tru,
@@ -43,9 +44,6 @@ var featuresCommand = cli.Command{
Selinux: features.Selinux{
Enabled: &tru,
},
Criu: features.Criu{
Enabled: &tru,
},
MountOptions: specconv.KnownMountOptions(),
Capabilities: capabilities.KnownCapabilities(),
}
16 changes: 6 additions & 10 deletions types/features/features.go
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ type Features struct {
Seccomp Seccomp `json:"seccomp"`
Apparmor Apparmor `json:"apparmor"`
Selinux Selinux `json:"selinux"`
Criu Criu `json:"criu"`

// Annotations contains implementation-specific annotation strings,
// such as the implementation version, and third-party extensions.
@@ -59,15 +58,6 @@ type Selinux struct {
Enabled *bool `json:"enabled"`
}

// Criu represents the "criu" field.
type Criu struct {
// Enabled is true if CRIU support is compiled in.
// Unrelated to whether the host supports CRIU or not.
// Nil value means "unknown", not "false".
// Always true in the current version of runc.
Enabled *bool `json:"enabled"`
}

// Cgroup represents the "cgroup" field.
type Cgroup struct {
// V1 represents whether Cgroup v1 support is compiled in.
@@ -105,6 +95,12 @@ const (
// Third party implementations such as crun and runsc SHOULD NOT use this annotation, as their repo is different from the runc repo.
AnnotationRuncCommit = "org.opencontainers.runc.commit"

// AnnotationRuncCheckpointEnabled is set to "true" if CRIU-based checkpointing is supported.
// Unrelated to whether the host supports CRIU or not.
// Always set to "true" in the current version of runc.
// This is defined as an annotation because checkpointing is a runc-specific feature that is not defined in the OCI Runtime Spec.
AnnotationRuncCheckpointEnabled = "org.opencontainers.runc.checkpoint.enabled"

// AnnotationLibseccompVersion is the version of libseccomp, e.g., "2.5.1".
// Note that the runtime MAY support seccomp even when this annotation is not present.
AnnotationLibseccompVersion = "io.github.seccomp.libseccomp.version"