openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Pin docker version for atomic at 1.8.2" into stable/liberty

This commit is contained in:
Jenkins 2016-02-26 23:36:20 +00:00 committed by Gerrit Code Review
parent 0e219d8d83 e2b0b704a3
commit a074b6ce06
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/firstboot/start_docker_agents.sh
View File

@ -54,9 +54,10 @@ echo nameserver 8.8.8.8 > /etc/resolv.conf
HOSTNAME=$(hostname)
echo "127.0.0.1 $HOSTNAME.localdomain $HOSTNAME" >> /etc/hosts
# Another hack.. we need latest docker..
# Another hack.. we need a different docker version
# (should obviously be dropped once the atomic image contains docker 1.8.2)
/usr/bin/systemctl stop docker.service
/bin/curl -o /tmp/docker https://get.docker.com/builds/Linux/x86_64/docker-latest
/bin/curl -o /tmp/docker https://get.docker.com/builds/Linux/x86_64/docker-1.8.2
/bin/mount -o remount,rw /usr
/bin/rm /bin/docker
/bin/cp /tmp/docker /bin/docker