Remove hack the pulls latest docker
authorRyan Hallisey <rhallise@redhat.com>
Tue, 15 Mar 2016 19:49:10 +0000 (19:49 +0000)
committerRyan Hallisey <rhallise@redhat.com>
Wed, 30 Mar 2016 15:29:39 +0000 (15:29 +0000)
Atomic is set to Docker 1.8.2. We no longer need to pull the
latest Docker to make our template work.

Change-Id: I8ab4e135ed4891763f8ced596116b14101466160
Co-Authored-By: Ian Main <imain@redhat.com>
docker/firstboot/start_docker_agents.sh

index 950466d..027aed4 100644 (file)
@@ -55,19 +55,6 @@ chmod 666 /dev/pts/ptmx
 HOSTNAME=$(hostname)
 echo "127.0.0.1 $HOSTNAME.localdomain $HOSTNAME" >> /etc/hosts
 
-# 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-1.8.2
-/bin/mount -o remount,rw /usr
-/bin/rm /bin/docker
-/bin/cp /tmp/docker /bin/docker
-/bin/chmod 755 /bin/docker
-
-# enable and start docker
-/usr/bin/systemctl enable docker.service
-/usr/bin/systemctl restart --no-block docker.service
-
 # enable and start heat-docker-agents
 chmod 0640 /etc/systemd/system/heat-docker-agents.service
 /usr/bin/systemctl enable heat-docker-agents.service