jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump up spec and add support for mount label 

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-04-22 15:31:39 -07:00 committed by Michael Crosby
parent 8e129e0972
commit 9d16d9472e
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

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

2
Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go generated vendored
View File

@ -140,6 +140,8 @@ type Linux struct {
MaskedPaths []string `json:"maskedPaths,omitempty"` MaskedPaths []string `json:"maskedPaths,omitempty"`
// ReadonlyPaths sets the provided paths as RO inside the container. // ReadonlyPaths sets the provided paths as RO inside the container.
ReadonlyPaths []string `json:"readonlyPaths,omitempty"` 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 // Namespace is the configuration for a Linux namespace

4
Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go generated vendored
View File

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

1
libcontainer/specconv/spec_linux.go
View File

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