aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-12 15:57:14 +0000
committerGerrit Code Review <review@openstack.org>2015-11-12 15:57:14 +0000
commitab683790561e57ce02b6da1c5b61222bae4e2146 (patch)
treea26ac46eca88260b6454842b46575e4f4ed46495 /docker
parent5eee49bd730b780dc27bb913f3181a816dd27eda (diff)
parent317186995a6e354b5866fd072b3b6b425f5b24d9 (diff)
Merge "Pin docker version for atomic at 1.8.2"
Diffstat (limited to 'docker')
-rw-r--r--docker/firstboot/start_docker_agents.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh
index caf511b..88759a5 100644
--- a/docker/firstboot/start_docker_agents.sh
+++ b/docker/firstboot/start_docker_agents.sh
@@ -52,9 +52,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