Merge pull request #773 from mrunalp/mount_label

Bump up spec and add support for mount label
This commit is contained in:
Qiang Huang 2016-04-23 08:09:26 +08:00
commit 45605bb48d
4 changed files with 7 additions and 4 deletions

4
Godeps/Godeps.json generated
View File

@ -58,8 +58,8 @@
},
{
"ImportPath": "github.com/opencontainers/runtime-spec/specs-go",
"Comment": "v0.5.0",
"Rev": "78e6667ae2d67aad100b28ee9580b41b7a24e667"
"Comment": "v0.5.0-34-g6e08c69",
"Rev": "6e08c6983ef8c2173f10ca09266907d4e9e71716"
},
{
"ImportPath": "github.com/seccomp/libseccomp-golang",

View File

@ -140,6 +140,8 @@ type Linux struct {
MaskedPaths []string `json:"maskedPaths,omitempty"`
// ReadonlyPaths sets the provided paths as RO inside the container.
ReadonlyPaths []string `json:"readonlyPaths,omitempty"`
// MountLabel specifies the selinux context for the mounts in the container.
MountLabel string `json:"mountLabel,omitempty"`
}
// Namespace is the configuration for a Linux namespace

View File

@ -6,12 +6,12 @@ const (
// VersionMajor is for an API incompatible changes
VersionMajor = 0
// VersionMinor is for functionality in a backwards-compatible manner
VersionMinor = 5
VersionMinor = 6
// VersionPatch is for backwards-compatible bug fixes
VersionPatch = 0
// VersionDev indicates development branch. Releases will be empty string.
VersionDev = ""
VersionDev = "-dev"
)
// Version is the specification version that the package types support.

View File

@ -226,6 +226,7 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
config.AdditionalGroups = append(config.AdditionalGroups, strconv.FormatUint(uint64(g), 10))
}
createHooks(spec, config)
config.MountLabel = spec.Linux.MountLabel
config.Version = specs.Version
return config, nil
}