openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
Mohammed Naser 2017-03-15 16:11:02 -04:00
parent 5397586ae4
commit 3d373e9812
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/setup_Debian.sh
View File

@ -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

5
tools/setup_RedHat.sh
View File

@ -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