diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-30 14:24:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-30 14:24:02 +0000 |
| commit | f5be229ae65beb9887ea68782bec07d73ff01d42 (patch) | |
| tree | a066d9a6c051ed5b860e80c49c833d27f69aaeb2 | |
| parent | 34b19f0dc1c43e4a6c713be2f76226583c1ba29a (diff) | |
| parent | 3d373e98126c5ad5654adc43465297b06a983aa2 (diff) | |
| download | kolla-f5be229ae65beb9887ea68782bec07d73ff01d42.tar.gz kolla-f5be229ae65beb9887ea68782bec07d73ff01d42.zip | |
Merge "Update Docker to 1.13.1"
| -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 |