diff options
| author |   Jeff Peeler <jpeeler@redhat.com> | 2015-11-09 17:40:19 -0500 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2015-11-09 17:46:01 -0500 |
| commit | 317186995a6e354b5866fd072b3b6b425f5b24d9 (patch) | |
| tree | 35a818ae92e114611c6a87cb2b124bb74b118c22 | |
| parent | 619ea4cf90b42b5654982bda96d4f3e7183aa3b5 (diff) | |
Pin docker version for atomic at 1.8.2
docker-latest now points to 1.9.0, which isn't the version we're
targetting. More importantly, docker-1.9.0 doesn't work since it
complains about /etc not being able to be relabeled. Not sure how to fix
that, but we can save that battle for another time.
Change-Id: I947b7569d9cf40a409253336e51b4dec5ada36f8
| -rw-r--r-- | docker/firstboot/start_docker_agents.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh index caf511bd..88759a5d 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 |