summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-11-15 16:57:00 -0500
committerGuo Ruijing <ruijing.guo@intel.com>2017-11-15 17:12:41 -0500
commitd2116720abfb794375875c1b41c0bc06e2f3e7db (patch)
tree16387d870111e11138abeaf0588b7c931b8cbcbf /ci
parent10f5da3a20e08d3fa9dd8291c5c520eeda32cce8 (diff)
change to docker 1.12.6 from dockerproject.org
Change-Id: Ic33efb5e204d63cfd870f47c4fd8fb8e1dbf7af1 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/Vagrantfile9
1 files changed, 8 insertions, 1 deletions
diff --git a/ci/Vagrantfile b/ci/Vagrantfile
index d2e990d..7bee0ac 100644
--- a/ci/Vagrantfile
+++ b/ci/Vagrantfile
@@ -7,12 +7,19 @@ chmod 700 .ssh
chmod 600 .ssh/authorized_keys
chown -R vagrant:vagrant .ssh
+
+sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+sudo apt-key adv -k 58118E89F3A912897C070ADBF76221572C52609D
+cat << EOF | sudo tee /etc/apt/sources.list.d/docker.list
+deb [arch=amd64] https://apt.dockerproject.org/repo ubuntu-xenial main
+EOF
+
curl -s http://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
cat <<EOF | tee /etc/apt/sources.list.d/kubernetes.list
deb http://apt.kubernetes.io/ kubernetes-xenial main
EOF
apt-get update
-apt-get install -y --allow-downgrades docker.io=1.12.6-0ubuntu1~16.04.1 kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
+apt-get install -y --allow-downgrades docker-engine=1.12.6-0~ubuntu-xenial kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00
docker pull gcr.io/google_containers/kube-proxy-amd64:v1.7.10
docker pull gcr.io/google_containers/kube-apiserver-amd64:v1.7.10
docker pull gcr.io/google_containers/kube-controller-manager-amd64:v1.7.10