From af2aac8736d71fe79492f9abf3a16fba97857eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Mon, 11 Mar 2013 23:07:16 -0700 Subject: [PATCH] Stream and unpack the tarball on the fly We don't need temporary files. Also, get the tarball from get.docker.io instead of Dropbox. --- install.sh | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/install.sh b/install.sh index 52cd3c0a08..2ecb8b47ae 100644 --- a/install.sh +++ b/install.sh @@ -2,18 +2,13 @@ # This script is meant for quick & easy install via 'curl URL-OF-SCRIPT | bash' # Courtesy of Jeff Lindsay -cd /tmp - echo "Ensuring dependencies are installed..." apt-get --yes install lxc wget bsdtar 2>&1 > /dev/null -echo "Downloading docker binary..." -wget -q https://dl.dropbox.com/u/20637798/docker.tar.gz 2>&1 > /dev/null -tar -xf docker.tar.gz 2>&1 > /dev/null - -echo "Installing into /usr/local/bin..." -mv docker/docker /usr/local/bin -mv dockerd/dockerd /usr/local/bin +echo "Downloading docker binary and uncompressing into /usr/local/bin..." +curl -s http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz | +tar -C /usr/local/bin --strip-components=1 -zxf- \ +docker-master/docker docker-master/dockerd if [[ -f /etc/init/dockerd.conf ]] then @@ -26,10 +21,5 @@ fi echo "Restarting dockerd..." restart dockerd > /dev/null -echo "Cleaning up..." -rmdir docker -rmdir dockerd -rm docker.tar.gz - echo "Finished!" echo