Skip to content

Commit

Permalink
Update containerd and runc vendoring
Browse files Browse the repository at this point in the history 
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2
runc: 85873d917e86676e44ccb80719fcb47a794676a1
runtime-specs: v1.0.0-rc1

Signed-off-by: Kenfe-Mickael Laventure <[email protected]>
  • Loading branch information
@mlaventure
mlaventure committed Jun 14, 2016
1 parent c913dd5 commit 2e9ea5c
Show file tree
Hide file tree
Showing 16 changed files with 287 additions and 209 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ RUN set -x \
&& rm -rf "$GOPATH"

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

# Install containerd
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.aarch64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ RUN set -x \
&& rm -rf "$GOPATH"

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

# Install containerd
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.armhf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ RUN set -x \
&& rm -rf "$GOPATH"

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

# Install containerd
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.gccgo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ WORKDIR /go/src/github.com/docker/docker
ENV DOCKER_BUILDTAGS apparmor seccomp selinux

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

# Install containerd
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ppc64le
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ RUN set -x \
&& rm -rf "$GOPATH"

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

# Install containerd
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.s390x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ RUN set -x \
&& rm -rf "$GOPATH"

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

# Install containerd
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.simple
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
ENV CGO_LDFLAGS -L/lib

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

# Install containerd
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \
Expand Down
16 changes: 8 additions & 8 deletions daemon/update_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ import (

func toContainerdResources(resources container.Resources) libcontainerd.Resources {
var r libcontainerd.Resources
r.BlkioWeight = uint32(resources.BlkioWeight)
r.CpuShares = uint32(resources.CPUShares)
r.CpuPeriod = uint32(resources.CPUPeriod)
r.CpuQuota = uint32(resources.CPUQuota)
r.BlkioWeight = uint64(resources.BlkioWeight)
r.CpuShares = uint64(resources.CPUShares)
r.CpuPeriod = uint64(resources.CPUPeriod)
r.CpuQuota = uint64(resources.CPUQuota)
r.CpusetCpus = resources.CpusetCpus
r.CpusetMems = resources.CpusetMems
r.MemoryLimit = uint32(resources.Memory)
r.MemoryLimit = uint64(resources.Memory)
if resources.MemorySwap > 0 {
r.MemorySwap = uint32(resources.MemorySwap)
r.MemorySwap = uint64(resources.MemorySwap)
}
r.MemoryReservation = uint32(resources.MemoryReservation)
r.KernelMemoryLimit = uint32(resources.KernelMemory)
r.MemoryReservation = uint64(resources.MemoryReservation)
r.KernelMemoryLimit = uint64(resources.KernelMemory)
return r
}
6 changes: 3 additions & 3 deletions hack/vendor.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ clone git github.com/miekg/pkcs11 df8ae6ca730422dba20c768ff38ef7d79077a59f
clone git github.com/docker/go v1.5.1-1-1-gbaf439e
clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c

clone git github.com/opencontainers/runc d49ece5a83da3dcb820121d6850e2b61bd0a5fbe # libcontainer
clone git github.com/opencontainers/specs f955d90e70a98ddfb886bd930ffd076da9b67998 # specs
clone git github.com/opencontainers/runc 85873d917e86676e44ccb80719fcb47a794676a1 # libcontainer
clone git github.com/opencontainers/specs v1.0.0-rc1 # specs
clone git github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
clone git github.com/coreos/go-systemd v4
Expand Down Expand Up @@ -136,7 +136,7 @@ clone git google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0 https
clone git github.com/docker/docker-credential-helpers v0.3.0

# containerd
clone git github.com/docker/containerd cf554d59dd96e459544748290eb9167f4bcde509
clone git github.com/docker/containerd 860f3a94940894ac0a106eff4bd1616a67407ee2

# cluster
clone git github.com/docker/swarmkit 45094b473cbdb2d45e4d8f703fb615989399ae29
Expand Down
Loading

0 comments on commit 2e9ea5c

Please sign in to comment.