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

Merge "Set Docker version to 1.6.2 due to Docker update"

Browse Source
This commit is contained in:
Jenkins 2015-06-04 21:43:46 +00:00 committed by Gerrit Code Review
commit 3f06af663d
2 changed files with 2 additions and 2 deletions
Show Stats 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
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.0
apt-get -y install lxc-docker=1.6.2
else
yum -y install docker
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
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.0
apt-get -y install lxc-docker=1.6.2
else
yum -y install docker
fi