Merge pull request #467 from Random-Liu/update-containerd

Update containerd
containerd · Dec 4, 2017 · 05bf76e · 05bf76e
2 parents 379a243 + 12a7188
commit 05bf76e
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 22 deletions.
diff --git a/hack/install-deps.sh b/hack/install-deps.sh
@@ -72,12 +72,17 @@ GOPATH=${GOPATH%%:*}
 # checkout_repo checks out specified repository
 # and switch to specified  version.
 # Varset:
-# 1) Repo name;
+# 1) Pkg name;
 # 2) Version.
+# 3) Repo name (optional);
 checkout_repo() {
-  repo=$1
+  pkg=$1
   version=$2
-  path="${GOPATH}/src/${repo}"
+  repo=${3:-""}
+  if [ -z "${repo}" ]; then
+    repo=${pkg}
+  fi
+  path="${GOPATH}/src/${pkg}"
   if [ ! -d ${path} ]; then
     mkdir -p ${path}
     git clone https://${repo} ${path}
@@ -130,7 +135,7 @@ EOF'
 fi
 
 # Install containerd
-checkout_repo ${CONTAINERD_PKG} ${CONTAINERD_VERSION}
+checkout_repo ${CONTAINERD_PKG} ${CONTAINERD_VERSION} ${CONTAINERD_REPO}
 cd ${GOPATH}/src/${CONTAINERD_PKG}
 make
 ${sudo} make install -e DESTDIR=${CONTAINERD_DIR}

diff --git a/hack/versions b/hack/versions
@@ -1,5 +1,6 @@
 RUNC_VERSION=74a17296470088de3805e138d3d87c62e613dfc4
 CNI_VERSION=v0.6.0
-CONTAINERD_VERSION=53c892d796a565127899d397e43bd52edf3148b0
+CONTAINERD_VERSION=cc969fb42f427a68a8cc6870ef47f17304b83962
+CONTAINERD_REPO=
 CRITOOL_VERSION=4cd2b047a26a2ef01bbd02ee55f7d70d8825ebb5
 KUBERNETES_VERSION=164317879bcd810b97e5ebf1c8df041770f2ff1b
diff --git a/vendor.conf b/vendor.conf
@@ -1,8 +1,7 @@
 github.com/blang/semver v3.1.0
-github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
 github.com/containerd/cgroups 29da22c6171a4316169f9205ab6c49f59b5b852f
-github.com/containerd/containerd 53c892d796a565127899d397e43bd52edf3148b0
+github.com/containerd/containerd cc969fb42f427a68a8cc6870ef47f17304b83962
 github.com/containerd/continuity cf279e6ac893682272b4479d4c67fd3abf878b4e
 github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788

diff --git a/vendor/github.com/containerd/containerd/container_opts_unix.go b/vendor/github.com/containerd/containerd/container_opts_unix.go
diff --git a/vendor/github.com/containerd/containerd/mount/mount_linux.go b/vendor/github.com/containerd/containerd/mount/mount_linux.go
diff --git a/vendor/github.com/containerd/containerd/oci/spec_opts_unix.go b/vendor/github.com/containerd/containerd/oci/spec_opts_unix.go