Skip to content
Snippets Groups Projects
Commit 6f2874cc authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Use latest docker engine in gate"

parents 7e2c3ec2 ae79f7bb
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ source /etc/lsb-release ...@@ -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 echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list
add_key add_key
sudo apt-get update 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 sudo service docker stop
if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then
......
...@@ -44,7 +44,7 @@ gpgcheck=1 ...@@ -44,7 +44,7 @@ gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg gpgkey=https://yum.dockerproject.org/gpg
EOF 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 setup_disk
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment