github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16697 from andyzheng0831/trusty 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-11-02 20:09:31 -08:00
parent f7f60004eb b3133a1c16
commit 1415f7509b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/trusty/node.yaml
View File

@ -118,8 +118,8 @@ script
# Install docker and brctl if they are not in the image.
if ! which docker > /dev/null; then
echo "Do not find docker. Install it."
# We should install the docker that passes qualification. At present, it is version 1.7.1.
curl -sSL https://get.docker.com/ubuntu/ | DOCKER_VERSION=1.7.1 sh
# We should install the latest qualified docker, which is version 1.8.3 at present.
curl -sSL https://get.docker.com/ | DOCKER_VERSION=1.8.3 sh
fi
if ! which brctl > /dev/null; then
echo "Do not find brctl. Install it."