diff options
| author |   Ryan Hallisey <rhallise@redhat.com> | 2016-03-15 19:49:10 +0000 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2016-03-30 15:29:39 +0000 |
| commit | 98f19c17a6a562cfcfed2dc9edc7391933492bc9 (patch) | |
| tree | 35cb73671cd307d1970e785cffde2c300c056917 /docker/firstboot | |
| parent | d2710b871b9f0141f0e7150590f896ab1fd71ba7 (diff) | |
Remove hack the pulls latest docker
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>
Diffstat (limited to 'docker/firstboot')
| -rw-r--r-- | docker/firstboot/start_docker_agents.sh | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh index 950466dd..027aed40 100644 --- a/docker/firstboot/start_docker_agents.sh +++ b/docker/firstboot/start_docker_agents.sh @@ -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 |