Updated Docker and k8s DIB elements
* Kubernetes element was updated to base on v1.0.6 * Docker now has its own repo and has different package name. Also it is now installed via downloadable script. TODO: Need somehow to fix docker version to 1.8.2 Change-Id: I230e9705cb850e9fb3772a67284561907d4be615 Implements: blueprint update-k8-to-v1-dib-elements Co-Authored-By: Alexey Deryugin <aderyugin@mirantis.com>
This commit is contained in:
parent
8c7eeb87e4
commit
ef413891de
@ -2,32 +2,5 @@
|
|||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
os=$(uname)
|
install-packages curl
|
||||||
dist_name='Unknown'
|
curl -sSL https://get.docker.com/ | sh
|
||||||
|
|
||||||
if [ "${os}" = "Linux" ] ; then
|
|
||||||
if [ -f /etc/redhat-release ] ; then
|
|
||||||
dist_name=$(cat /etc/redhat-release |sed s/\ release.*//)
|
|
||||||
elif [ -f /etc/SuSE-release ] ; then
|
|
||||||
dist_name='SuSe'
|
|
||||||
elif [ -f /etc/lsb-release ]; then
|
|
||||||
dist=$(cat /etc/lsb-release | grep '^DISTRIB_ID' | awk -F= '{ print $2 }')
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Convert ditribition name to lowercase
|
|
||||||
dist_name=${dist_name,,}
|
|
||||||
|
|
||||||
if [ "${dist_name}" == 'ubuntu' ]; then
|
|
||||||
if [ -e /usr/lib/apt/methods/https ]; then
|
|
||||||
apt-get update
|
|
||||||
apt-get install apt-transport-https
|
|
||||||
fi
|
|
||||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
|
|
||||||
echo "deb https://get.docker.com/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install lxc-docker=1.6.2
|
|
||||||
else
|
|
||||||
install-packages curl
|
|
||||||
curl -sSL https://get.docker.com/ | sh
|
|
||||||
fi
|
|
||||||
|
@ -2,32 +2,5 @@
|
|||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
os=$(uname)
|
install-packages curl
|
||||||
dist_name='Unknown'
|
curl -sSL https://get.docker.com/ | sh
|
||||||
|
|
||||||
if [ "${os}" = "Linux" ] ; then
|
|
||||||
if [ -f /etc/redhat-release ] ; then
|
|
||||||
dist_name=$(cat /etc/redhat-release |sed s/\ release.*//)
|
|
||||||
elif [ -f /etc/SuSE-release ] ; then
|
|
||||||
dist_name='SuSe'
|
|
||||||
elif [ -f /etc/lsb-release ]; then
|
|
||||||
dist=$(cat /etc/lsb-release | grep '^DISTRIB_ID' | awk -F= '{ print $2 }')
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Convert ditribition name to lowercase
|
|
||||||
dist_name=${dist_name,,}
|
|
||||||
|
|
||||||
if [ "${dist_name}" == 'ubuntu' ]; then
|
|
||||||
if [ -e /usr/lib/apt/methods/https ]; then
|
|
||||||
apt-get update
|
|
||||||
apt-get install apt-transport-https
|
|
||||||
fi
|
|
||||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
|
|
||||||
echo "deb https://get.docker.com/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
|
|
||||||
apt-get update
|
|
||||||
apt-get -y install lxc-docker=1.6.2
|
|
||||||
else
|
|
||||||
install-packages curl
|
|
||||||
curl -sSL https://get.docker.com/ | sh
|
|
||||||
fi
|
|
||||||
|
@ -3,9 +3,9 @@ install-packages curl wget linux-libc-dev git gcc libc6-dev bridge-utils haproxy
|
|||||||
|
|
||||||
SVC_ROOT=/opt/bin
|
SVC_ROOT=/opt/bin
|
||||||
|
|
||||||
ETCD_LATEST_VERSION="v2.0.9"
|
ETCD_LATEST_VERSION="v2.0.13"
|
||||||
KUBE_LATEST_VERSION="v0.15.0"
|
KUBE_LATEST_VERSION="v1.0.6"
|
||||||
FLANNEL_LATEST_VERSION="v0.3.1"
|
FLANNEL_LATEST_VERSION="v0.5.3"
|
||||||
|
|
||||||
ETCD_LATEST_URL="https://github.com/coreos/etcd/releases/download/${ETCD_LATEST_VERSION}/etcd-${ETCD_LATEST_VERSION}-linux-amd64.tar.gz"
|
ETCD_LATEST_URL="https://github.com/coreos/etcd/releases/download/${ETCD_LATEST_VERSION}/etcd-${ETCD_LATEST_VERSION}-linux-amd64.tar.gz"
|
||||||
KUBE_LATEST_URL="https://github.com/GoogleCloudPlatform/kubernetes/releases/download/${KUBE_LATEST_VERSION}/kubernetes.tar.gz"
|
KUBE_LATEST_URL="https://github.com/GoogleCloudPlatform/kubernetes/releases/download/${KUBE_LATEST_VERSION}/kubernetes.tar.gz"
|
||||||
@ -34,8 +34,6 @@ mv ${SVC_ROOT}/kubernetes ${SVC_ROOT}/kubernetes-latest
|
|||||||
|
|
||||||
cp ${SVC_ROOT}/kubernetes-latest/server/bin/* ${SVC_ROOT}/
|
cp ${SVC_ROOT}/kubernetes-latest/server/bin/* ${SVC_ROOT}/
|
||||||
|
|
||||||
rm -rf ${SVC_ROOT}/kubernetes-latest
|
|
||||||
|
|
||||||
# Install Go
|
# Install Go
|
||||||
wget -O go.tar.gz https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
|
wget -O go.tar.gz https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
|
||||||
tar xzvf go.tar.gz
|
tar xzvf go.tar.gz
|
||||||
@ -67,4 +65,4 @@ mv confd /usr/local/bin/confd
|
|||||||
chmod +x /usr/local/bin/confd
|
chmod +x /usr/local/bin/confd
|
||||||
mkdir -p /etc/confd/{conf.d,templates}
|
mkdir -p /etc/confd/{conf.d,templates}
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
Loading…
Reference in New Issue
Block a user