diff options
| author | Mohammed Naser <mnaser@vexxhost.com> | 2017-03-15 16:11:02 -0400 |
|---|---|---|
| committer | Mohammed Naser <mnaser@vexxhost.com> | 2017-03-15 18:24:03 -0400 |
| commit | 3d373e98126c5ad5654adc43465297b06a983aa2 (patch) | |
| tree | 2d3a582c95cbec8d6357f43536785cbed373f7bd | |
| parent | 5397586ae46e59be457259a8bffc1fabb3885b98 (diff) | |
| download | kolla-3d373e98126c5ad5654adc43465297b06a983aa2.tar.gz kolla-3d373e98126c5ad5654adc43465297b06a983aa2.zip | |
Update Docker to 1.13.1
There were a few issues blocking Kolla from going up to the
latest version of Docker which is 1.13. Most of these issues
seem to have been addressed by 1.13.1.
This patch updates the version installed by Kolla to 1.13.1
for the testing infrastructure to prevent the following
bug which is causing gate failures:
https://github.com/docker/docker/issues/28336
Change-Id: I0d3569b589ee792c9aa6eaa7c539219fcc784271
| -rwxr-xr-x | tools/setup_Debian.sh | 2 | ||||
| -rwxr-xr-x | tools/setup_RedHat.sh | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh index 0c3257838..7b088722a 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=1.13.1*' sudo service docker stop if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index 5a3f48458..490f82563 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -44,7 +44,10 @@ 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{,-selinux}-1.13.1 btrfs-progs + +# Disable SELinux +setenforce 0 setup_disk |