Bump runc to 85873d917e86676e44ccb80719fcb47a79467

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-06-13 12:50:23 -07:00
parent 3d900051b6
commit d307ab6fa2
5 changed files with 71 additions and 15 deletions

View file

@ -55,7 +55,7 @@ RUN set -x \
&& rm -rf "$SECCOMP_PATH" && rm -rf "$SECCOMP_PATH"
# Install runc # Install runc
ENV RUNC_COMMIT eb217f273125d3e4d6731389fe804e46e0b14ac6 ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \

View file

@ -14,8 +14,8 @@ clone git github.com/docker/go-units 5d2041e26a699eaca682e2ea41c8f891e1060444
clone git github.com/godbus/dbus e2cf28118e66a6a63db46cf6088a35d2054d3bb0 clone git github.com/godbus/dbus e2cf28118e66a6a63db46cf6088a35d2054d3bb0
clone git github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998 clone git github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998
clone git github.com/golang/protobuf 3c84672111d91bb5ac31719e112f9f7126a0e26e clone git github.com/golang/protobuf 3c84672111d91bb5ac31719e112f9f7126a0e26e
clone git github.com/opencontainers/runc eb217f273125d3e4d6731389fe804e46e0b14ac6 clone git github.com/opencontainers/runc 85873d917e86676e44ccb80719fcb47a794676a1
clone git github.com/opencontainers/runtime-spec f955d90e70a98ddfb886bd930ffd076da9b67998 clone git github.com/opencontainers/runtime-spec v1.0.0-rc1
clone git github.com/rcrowley/go-metrics eeba7bd0dd01ace6e690fa833b3f22aaec29af43 clone git github.com/rcrowley/go-metrics eeba7bd0dd01ace6e690fa833b3f22aaec29af43
clone git github.com/satori/go.uuid f9ab0dce87d815821e221626b772e3475a0d2749 clone git github.com/satori/go.uuid f9ab0dce87d815821e221626b772e3475a0d2749
clone git github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852 clone git github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852

View file

@ -2,9 +2,7 @@ package specs
import "os" import "os"
// Spec is the base configuration for the container. It specifies platform // Spec is the base configuration for the container.
// independent configuration. This information must be included when the
// bundle is packaged for distribution.
type Spec struct { type Spec struct {
// Version is the version of the specification that is supported. // Version is the version of the specification that is supported.
Version string `json:"ociVersion"` Version string `json:"ociVersion"`
@ -17,20 +15,22 @@ type Spec struct {
// Hostname is the container's host name. // Hostname is the container's host name.
Hostname string `json:"hostname,omitempty"` Hostname string `json:"hostname,omitempty"`
// Mounts profile configuration for adding mounts to the container's filesystem. // Mounts profile configuration for adding mounts to the container's filesystem.
Mounts []Mount `json:"mounts"` Mounts []Mount `json:"mounts,omitempty"`
// Hooks are the commands run at various lifecycle events of the container. // Hooks are the commands run at various lifecycle events of the container.
Hooks Hooks `json:"hooks"` Hooks Hooks `json:"hooks"`
// Annotations is an unstructured key value map that may be set by external tools to store and retrieve arbitrary metadata. // Annotations is an unstructured key value map that may be set by external tools to store and retrieve arbitrary metadata.
Annotations map[string]string `json:"annotations,omitempty"` Annotations map[string]string `json:"annotations,omitempty"`
// Linux is platform specific configuration for Linux based containers. // Linux is platform specific configuration for Linux based containers.
Linux Linux `json:"linux" platform:"linux"` Linux Linux `json:"linux" platform:"linux,omitempty"`
// Solaris is platform specific configuration for Solaris containers.
Solaris Solaris `json:"solaris" platform:"solaris,omitempty"`
} }
// Process contains information to start a specific application inside the container. // Process contains information to start a specific application inside the container.
type Process struct { type Process struct {
// Terminal creates an interactive terminal for the container. // Terminal creates an interactive terminal for the container.
Terminal bool `json:"terminal"` Terminal bool `json:"terminal,omitempty"`
// User specifies user information for the process. // User specifies user information for the process.
User User `json:"user"` User User `json:"user"`
// Args specifies the binary and arguments for the application to execute. // Args specifies the binary and arguments for the application to execute.
@ -57,9 +57,9 @@ type Process struct {
// main process. // main process.
type User struct { type User struct {
// UID is the user id. (this field is platform dependent) // UID is the user id. (this field is platform dependent)
UID uint32 `json:"uid,omitempty" platform:"linux"` UID uint32 `json:"uid" platform:"linux"`
// GID is the group id. (this field is platform dependent) // GID is the group id. (this field is platform dependent)
GID uint32 `json:"gid,omitempty" platform:"linux"` GID uint32 `json:"gid" platform:"linux"`
// AdditionalGids are additional group ids set for the container's process. (this field is platform dependent) // AdditionalGids are additional group ids set for the container's process. (this field is platform dependent)
AdditionalGids []uint32 `json:"additionalGids,omitempty" platform:"linux"` AdditionalGids []uint32 `json:"additionalGids,omitempty" platform:"linux"`
} }
@ -69,7 +69,7 @@ type Root struct {
// Path is the absolute path to the container's root filesystem. // Path is the absolute path to the container's root filesystem.
Path string `json:"path"` Path string `json:"path"`
// Readonly makes the root filesystem for the container readonly before the process is executed. // Readonly makes the root filesystem for the container readonly before the process is executed.
Readonly bool `json:"readonly"` Readonly bool `json:"readonly,omitempty"`
} }
// Platform specifies OS and arch information for the host system that the container // Platform specifies OS and arch information for the host system that the container
@ -169,6 +169,8 @@ const (
UTSNamespace = "uts" UTSNamespace = "uts"
// UserNamespace for isolating user and group IDs // UserNamespace for isolating user and group IDs
UserNamespace = "user" UserNamespace = "user"
// CgroupNamespace for isolating cgroup hierarchies
CgroupNamespace = "cgroup"
) )
// IDMapping specifies UID/GID mappings // IDMapping specifies UID/GID mappings
@ -358,6 +360,51 @@ type Seccomp struct {
Syscalls []Syscall `json:"syscalls,omitempty"` Syscalls []Syscall `json:"syscalls,omitempty"`
} }
// Solaris contains platform specific configuration for Solaris application containers.
type Solaris struct {
// SMF FMRI which should go "online" before we start the container process.
Milestone string `json:"milestone,omitempty"`
// Maximum set of privileges any process in this container can obtain.
LimitPriv string `json:"limitpriv,omitempty"`
// The maximum amount of shared memory allowed for this container.
MaxShmMemory string `json:"maxShmMemory,omitempty"`
// Specification for automatic creation of network resources for this container.
Anet []Anet `json:"anet,omitempty"`
// Set limit on the amount of CPU time that can be used by container.
CappedCPU CappedCPU `json:"cappedCPU,omitempty"`
// The physical and swap caps on the memory that can be used by this container.
CappedMemory CappedMemory `json:"cappedMemory,omitempty"`
}
// CappedCPU allows users to set limit on the amount of CPU time that can be used by container.
type CappedCPU struct {
Ncpus string `json:"ncpus,omitempty"`
}
// CappedMemory allows users to set the physical and swap caps on the memory that can be used by this container.
type CappedMemory struct {
Physical string `json:"physical,omitempty"`
Swap string `json:"swap,omitempty"`
}
// Anet provides the specification for automatic creation of network resources for this container.
type Anet struct {
// Specify a name for the automatically created VNIC datalink.
Linkname string `json:"linkname,omitempty"`
// Specify the link over which the VNIC will be created.
Lowerlink string `json:"lowerLink,omitempty"`
// The set of IP addresses that the container can use.
Allowedaddr string `json:"allowedAddress,omitempty"`
// Specifies whether allowedAddress limitation is to be applied to the VNIC.
Configallowedaddr string `json:"configureAllowedAddress,omitempty"`
// The value of the optional default router.
Defrouter string `json:"defrouter,omitempty"`
// Enable one or more types of link protection.
Linkprotection string `json:"linkProtection,omitempty"`
// Set the VNIC's macAddress
Macaddress string `json:"macAddress,omitempty"`
}
// Arch used for additional architectures // Arch used for additional architectures
type Arch string type Arch string
@ -375,6 +422,11 @@ const (
ArchMIPSEL Arch = "SCMP_ARCH_MIPSEL" ArchMIPSEL Arch = "SCMP_ARCH_MIPSEL"
ArchMIPSEL64 Arch = "SCMP_ARCH_MIPSEL64" ArchMIPSEL64 Arch = "SCMP_ARCH_MIPSEL64"
ArchMIPSEL64N32 Arch = "SCMP_ARCH_MIPSEL64N32" ArchMIPSEL64N32 Arch = "SCMP_ARCH_MIPSEL64N32"
ArchPPC Arch = "SCMP_ARCH_PPC"
ArchPPC64 Arch = "SCMP_ARCH_PPC64"
ArchPPC64LE Arch = "SCMP_ARCH_PPC64LE"
ArchS390 Arch = "SCMP_ARCH_S390"
ArchS390X Arch = "SCMP_ARCH_S390X"
) )
// Action taken upon Seccomp rule match // Action taken upon Seccomp rule match

View file

@ -6,8 +6,12 @@ type State struct {
Version string `json:"version"` Version string `json:"version"`
// ID is the container ID // ID is the container ID
ID string `json:"id"` ID string `json:"id"`
// Status is the runtime state of the container.
Status string `json:"status"`
// Pid is the process id for the container's main process. // Pid is the process id for the container's main process.
Pid int `json:"pid"` Pid int `json:"pid"`
// BundlePath is the path to the container's bundle directory. // BundlePath is the path to the container's bundle directory.
BundlePath string `json:"bundlePath"` BundlePath string `json:"bundlePath"`
// Annotations are the annotations associated with the container.
Annotations map[string]string `json:"annotations"`
} }

View file

@ -4,14 +4,14 @@ import "fmt"
const ( const (
// VersionMajor is for an API incompatible changes // VersionMajor is for an API incompatible changes
VersionMajor = 0 VersionMajor = 1
// VersionMinor is for functionality in a backwards-compatible manner // VersionMinor is for functionality in a backwards-compatible manner
VersionMinor = 6 VersionMinor = 0
// 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 = "-dev" VersionDev = "-rc1"
) )
// Version is the specification version that the package types support. // Version is the specification version that the package types support.