Skip to content

Commit 2e9ea5c

Browse files
mlaventuremlaventure
committed
Update containerd and runc vendoring
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2 runc: 85873d917e86676e44ccb80719fcb47a794676a1 runtime-specs: v1.0.0-rc1 Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
1 parent c913dd5 commit 2e9ea5c

16 files changed

Lines changed: 287 additions & 209 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ RUN set -x \
233233
&& rm -rf "$GOPATH"
234234

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

246246
# Install containerd
247-
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
247+
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
248248
RUN set -x \
249249
&& export GOPATH="$(mktemp -d)" \
250250
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

‎Dockerfile.aarch64‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ RUN set -x \
180180
&& rm -rf "$GOPATH"
181181

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

193193
# Install containerd
194-
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
194+
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
195195
RUN set -x \
196196
&& export GOPATH="$(mktemp -d)" \
197197
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

‎Dockerfile.armhf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ RUN set -x \
189189
&& rm -rf "$GOPATH"
190190

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

202202
# Install containerd
203-
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
203+
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
204204
RUN set -x \
205205
&& export GOPATH="$(mktemp -d)" \
206206
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

‎Dockerfile.gccgo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ WORKDIR /go/src/github.com/docker/docker
7474
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
7575

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

8787
# Install containerd
88-
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
88+
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
8989
RUN set -x \
9090
&& export GOPATH="$(mktemp -d)" \
9191
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

‎Dockerfile.ppc64le‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ RUN set -x \
204204
&& rm -rf "$GOPATH"
205205

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

217217
# Install containerd
218-
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
218+
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
219219
RUN set -x \
220220
&& export GOPATH="$(mktemp -d)" \
221221
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

‎Dockerfile.s390x‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ RUN set -x \
197197
&& rm -rf "$GOPATH"
198198

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

210210
# Install containerd
211-
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
211+
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
212212
RUN set -x \
213213
&& export GOPATH="$(mktemp -d)" \
214214
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

‎Dockerfile.simple‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
5757
ENV CGO_LDFLAGS -L/lib
5858

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

7070
# Install containerd
71-
ENV CONTAINERD_COMMIT cf554d59dd96e459544748290eb9167f4bcde509
71+
ENV CONTAINERD_COMMIT 860f3a94940894ac0a106eff4bd1616a67407ee2
7272
RUN set -x \
7373
&& export GOPATH="$(mktemp -d)" \
7474
&& git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd" \

‎daemon/update_linux.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ import (
99

1010
func toContainerdResources(resources container.Resources) libcontainerd.Resources {
1111
var r libcontainerd.Resources
12-
r.BlkioWeight = uint32(resources.BlkioWeight)
13-
r.CpuShares = uint32(resources.CPUShares)
14-
r.CpuPeriod = uint32(resources.CPUPeriod)
15-
r.CpuQuota = uint32(resources.CPUQuota)
12+
r.BlkioWeight = uint64(resources.BlkioWeight)
13+
r.CpuShares = uint64(resources.CPUShares)
14+
r.CpuPeriod = uint64(resources.CPUPeriod)
15+
r.CpuQuota = uint64(resources.CPUQuota)
1616
r.CpusetCpus = resources.CpusetCpus
1717
r.CpusetMems = resources.CpusetMems
18-
r.MemoryLimit = uint32(resources.Memory)
18+
r.MemoryLimit = uint64(resources.Memory)
1919
if resources.MemorySwap > 0 {
20-
r.MemorySwap = uint32(resources.MemorySwap)
20+
r.MemorySwap = uint64(resources.MemorySwap)
2121
}
22-
r.MemoryReservation = uint32(resources.MemoryReservation)
23-
r.KernelMemoryLimit = uint32(resources.KernelMemory)
22+
r.MemoryReservation = uint64(resources.MemoryReservation)
23+
r.KernelMemoryLimit = uint64(resources.KernelMemory)
2424
return r
2525
}

‎hack/vendor.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ clone git github.com/miekg/pkcs11 df8ae6ca730422dba20c768ff38ef7d79077a59f
102102
clone git github.com/docker/go v1.5.1-1-1-gbaf439e
103103
clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
104104

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

138138
# containerd
139-
clone git github.com/docker/containerd cf554d59dd96e459544748290eb9167f4bcde509
139+
clone git github.com/docker/containerd 860f3a94940894ac0a106eff4bd1616a67407ee2
140140

141141
# cluster
142142
clone git github.com/docker/swarmkit 45094b473cbdb2d45e4d8f703fb615989399ae29

0 commit comments

Comments
 (0)