From e22c0ee3c39638aaf0dc15fb33d857890136f142 Mon Sep 17 00:00:00 2001 From: Sean Larimore Date: Tue, 21 Nov 2017 21:16:58 -0700 Subject: [PATCH 1/2] Fixed installation of incorrect docker version by using rancher install script for 1.12.6 --- 01-bootkube-gen-up | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/01-bootkube-gen-up b/01-bootkube-gen-up index 091d516..eb3ad19 100755 --- a/01-bootkube-gen-up +++ b/01-bootkube-gen-up @@ -37,7 +37,7 @@ EOF ### NEW INSTALLATIONS: echo_green "\nPhase I: Installing system prerequisites:" -pkg="build-essential curl docker.io ethtool git lldpd socat traceroute vim ceph-common nfs-common" +pkg="build-essential curl ethtool git lldpd socat traceroute vim ceph-common nfs-common" for pkg in $pkg; do if sudo dpkg --get-selections | grep -q "^$pkg[[:space:]]*install$" >/dev/null; then @@ -48,6 +48,7 @@ for pkg in $pkg; do fi done +curl https://raw.githubusercontent.com/rancher/install-docker/master/1.12.6.sh | bash ### PREPARE THE ENVIRONMENT: sudo service docker restart From bb90beb55a371f3d52407ab61b11368cb552ccb2 Mon Sep 17 00:00:00 2001 From: Sean Larimore Date: Wed, 22 Nov 2017 00:30:51 -0700 Subject: [PATCH 2/2] fixed docker installation for node-add script --- deploy-node/node-add | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy-node/node-add b/deploy-node/node-add index 14d0dbe..6ec8879 100755 --- a/deploy-node/node-add +++ b/deploy-node/node-add @@ -42,7 +42,7 @@ EOF ### NEW INSTALLATIONS: echo_green "\nPhase I: Installing system prerequisites:" -pkg="build-essential curl docker.io ethtool git lldpd socat traceroute vim ceph-common nfs-common" +pkg="build-essential curl ethtool git lldpd socat traceroute vim ceph-common nfs-common" for pkg in ${pkg}; do if sudo dpkg --get-selections | grep -q "^${pkg}[[:space:]]*install$" >/dev/null; then @@ -53,6 +53,8 @@ for pkg in ${pkg}; do fi done +curl https://raw.githubusercontent.com/rancher/install-docker/master/1.12.6.sh | bash + ### PREPARE: /etc/resolv.conf echo_green "\nPhase III: Preparing system DNS:"