From ae79f7bb7c0d10d51a46992221ca3ae20a4ad294 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Tue, 4 Jul 2017 22:26:24 +0800 Subject: [PATCH] Use latest docker engine in gate Kolla support latest docker engine right now. Closes-Bug: #1661549 Change-Id: I5074fd16bdd158df8e97f909dead0a59a14fdf42 --- tools/setup_Debian.sh | 2 +- tools/setup_RedHat.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index 5154989d32..10d08f0071 100755 --- a/tools/setup_Debian.sh +++ b/tools/setup_Debian.sh @@ -57,7 +57,7 @@ source /etc/lsb-release echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list add_key sudo apt-get update -sudo apt-get -y install --no-install-recommends 'docker-engine=1.12.*' +sudo apt-get -y install --no-install-recommends docker-engine sudo service docker stop if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index 581af0be9d..fe02691195 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -44,7 +44,7 @@ gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg EOF -sudo yum -y install libffi-devel openssl-devel docker-engine-1.12.6 docker-engine-selinux-1.12.6 btrfs-progs +sudo yum -y install libffi-devel openssl-devel docker-engine docker-engine-selinux btrfs-progs setup_disk