x/daisycloud-core
Code Issues Proposed changes

fix the docker version to 17.05

Browse Source 
Change-Id: I25983c6f56c3b2007482732c3ae8671847b3d47c
This commit is contained in:
root 2017-06-29 19:55:15 +08:00 committed by Zhijiang Hu
parent 02fcbddc87
commit a5f11cf3a0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/kolla/prepare.sh
View File

@ -2,7 +2,9 @@
echo "nameserver 8.8.8.8" > /etc/resolv.conf echo "nameserver 8.8.8.8" > /etc/resolv.conf
daisy_management_ip=$1 daisy_management_ip=$1
yum -y install epel-release yum -y install epel-release
curl -sSL https://get.docker.io | bash #curl -sSL https://get.docker.io | bash
yum remove -y docker-engine
yum install -y https://yum.dockerproject.org/repo/main/centos/7/Packages/docker-engine-17.05.0.ce-1.el7.centos.x86_64.rpm
mkdir -p /etc/systemd/system/docker.service.d mkdir -p /etc/systemd/system/docker.service.d
config_path=/etc/systemd/system/docker.service.d/kolla.conf config_path=/etc/systemd/system/docker.service.d/kolla.conf
touch /etc/sysconfig/docker touch /etc/sysconfig/docker

4
tools/setup/install/install_func.sh
View File

@ -66,7 +66,9 @@ function kolla_install
if [[ "$has_installed" == "yes" ]];then if [[ "$has_installed" == "yes" ]];then
echo "docker-engine has been already installed" echo "docker-engine has been already installed"
else else
curl -sSL https://get.docker.io | bash #curl -sSL https://get.docker.io | bash
yum remove -y docker-engine
yum install -y https://yum.dockerproject.org/repo/main/centos/7/Packages/docker-engine-17.05.0.ce-1.el7.centos.x86_64.rpm
fi fi
mkdir -p /etc/systemd/system/docker.service.d mkdir -p /etc/systemd/system/docker.service.d
config_path=/etc/systemd/system/docker.service.d/kolla.conf config_path=/etc/systemd/system/docker.service.d/kolla.conf