starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-24 07:25:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27160 from mlaventure/update-containerd

Browse Source 
Update containerd and runc
Upstream-commit: 5ee2c2a6475056f55327ce77b61677499a9e3fa8
Component: engine
This commit is contained in:
Justin Cormack
2016-10-06 19:36:31 +02:00
committed by GitHub
parent 9f9ffdba55 6e5d016ba6
commit 9ad2ffa17a
18 changed files with 84 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/hack/dockerfile/install-binaries.sh
+2 -2
View File
@@ -3,8 +3,8 @@ set -e
set -x
TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
RUNC_COMMIT=cc29e3dded8e27ba8f65738f40d251c885030a28
CONTAINERD_COMMIT=2545227b0357eb55e369fa0072baef9ad91cdb69
RUNC_COMMIT=02f8fa7863dd3f82909a73e2061897828460d52f
CONTAINERD_COMMIT=837e8c5e1cad013ed57f5c2090c8591c10cbbdae
GRIMES_COMMIT=f207601a8d19a534cc90d9e26e037e9931ccb9db
export GOPATH="$(mktemp -d)"
components/engine/hack/vendor.sh
+2 -2
View File
@@ -106,7 +106,7 @@ 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 cc29e3dded8e27ba8f65738f40d251c885030a28 # libcontainer
clone git github.com/opencontainers/runc 02f8fa7863dd3f82909a73e2061897828460d52f # libcontainer
clone git github.com/opencontainers/runtime-spec 1c7c27d043c2a5e513a44084d2b10d77d1402b8c # specs
clone git github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
@@ -140,7 +140,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 2545227b0357eb55e369fa0072baef9ad91cdb69
clone git github.com/docker/containerd 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
# cluster
clone git github.com/docker/swarmkit 7e63bdefb94e5bea2641e8bdebae2cfa61a0ed44