浏览代码

Merge pull request #74 from jpetazzo/contrib-install-sh

Update get.docker.io install script for single-binary
Solomon Hykes 12 年之前
父节点
当前提交
722d4c92c3
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      contrib/install.sh

+ 2 - 2
install.sh → contrib/install.sh

@@ -38,14 +38,14 @@ fi
 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
+docker-master/docker
 
 if [ -f /etc/init/dockerd.conf ]
 then
   echo "Upstart script already exists."
 else
   echo "Creating /etc/init/dockerd.conf..."
-  echo "exec /usr/local/bin/dockerd" > /etc/init/dockerd.conf
+  echo "exec /usr/local/bin/docker -d" > /etc/init/dockerd.conf
 fi
 
 echo "Starting dockerd..."