x/k8s-docker-suite-app-murano
Code Issues Proposed changes

Set Docker version to 1.6.2 due to Docker update

Browse Source 
Change-Id: Idf9e400191787c4df76011a41c192194fd45b012
Closes-Bug: #1457086
This commit is contained in:
Alexey Deryugin
2015-05-20 18:08:50 +03:00
parent e882ebbffc
commit 96701cbcfa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DockerStandaloneHost/elements/docker/install.d/56-docker
View File

@@ -10,7 +10,7 @@ if [ -e /etc/lsb-release ]; then
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 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 echo "deb https://get.docker.com/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
apt-get update apt-get update
apt-get -y install lxc-docker=1.6.0 apt-get -y install lxc-docker=1.6.2
else else
yum -y install docker yum -y install docker
fi fi

2
Kubernetes/KubernetesCluster/elements/docker/install.d/56-docker
View File

@@ -10,7 +10,7 @@ if [ -e /etc/lsb-release ]; then
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 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 echo "deb https://get.docker.com/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
apt-get update apt-get update
apt-get -y install lxc-docker=1.6.0 apt-get -y install lxc-docker=1.6.2
else else
yum -y install docker yum -y install docker
fi fi