From e25811108bbd2c4591b4b83f5c479ac8462cf3a2 Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Fri, 22 Apr 2016 15:31:39 -0700 Subject: [PATCH] Bump up spec and add support for mount label Signed-off-by: Mrunal Patel --- Godeps/Godeps.json | 4 ++-- .../github.com/opencontainers/runtime-spec/specs-go/config.go | 2 ++ .../opencontainers/runtime-spec/specs-go/version.go | 4 ++-- libcontainer/specconv/spec_linux.go | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 24c1afbc..964fd2a8 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -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", diff --git a/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go b/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go index 3e5d499e..2daba464 100644 --- a/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go +++ b/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go @@ -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 diff --git a/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go b/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go index 67f1a9d9..371289ae 100644 --- a/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go +++ b/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go @@ -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. diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go index 79323dbf..f156ae12 100644 --- a/libcontainer/specconv/spec_linux.go +++ b/libcontainer/specconv/spec_linux.go @@ -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 }