Update: Docker Engine to 1.8.1

William-Yeh · Aug 13, 2015 · 3970b80 · 3970b80
1 parent 9501452
commit 3970b80
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/DOCKER-VERSION b/DOCKER-VERSION
@@ -1 +1 @@
-1.7.1
+1.8.1
diff --git a/centos7/vagrant-provision.sh b/centos7/vagrant-provision.sh
@@ -13,10 +13,10 @@ export LANG=en_US.UTF-8
 export LANGUAGE=en_US.UTF-8
 
 
-readonly COMPOSE_VERSION=1.3.3
-readonly MACHINE_VERSION=v0.3.0
+readonly COMPOSE_VERSION=1.4.0
+readonly MACHINE_VERSION=v0.4.0
 
-readonly DOCKVIZ_VERSION=v0.2
+readonly DOCKVIZ_VERSION=v0.2.1
 readonly DOCKVIZ_EXE_URL=https://github.com/justone/dockviz/releases/download/$DOCKVIZ_VERSION/dockviz_linux_amd64
 
 readonly DOCKERGEN_VERSION=0.4.0
@@ -70,7 +70,7 @@ fi
 
 
 # update packages
-#sudo yum -y update
+sudo yum -y update
 #sudo yum -y -q upgrade
 
 
@@ -80,9 +80,7 @@ fi
 #
 
 # install Docker
-yum -y install docker
-curl -sSL https://get.docker.com/builds/Linux/x86_64/docker-latest -o /usr/bin/docker
-chmod a+x /usr/bin/docker
+curl -sL https://get.docker.io/ | sudo sh
 
 # configure for docker
 sed -i -e "s/^# INSECURE_REGISTRY=.*$/INSECURE_REGISTRY='--insecure-registry registry.com'/"  /etc/sysconfig/docker

diff --git a/debian-jessie/docker.service b/debian-jessie/docker.service
@@ -6,7 +6,7 @@ Requires=docker.socket
 
 [Service]
 Environment="DOCKER_OPTS=-H tcp://0.0.0.0:2375 --insecure-registry registry.com"
-ExecStart=/usr/bin/docker -d -H fd://  $DOCKER_OPTS
+ExecStart=/usr/bin/docker daemon -H fd://  $DOCKER_OPTS
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576

diff --git a/debian-jessie/vagrant-provision.sh b/debian-jessie/vagrant-provision.sh
@@ -14,10 +14,10 @@ export LANG=en_US.UTF-8
 export LANGUAGE=en_US.UTF-8
 
 
-readonly COMPOSE_VERSION=1.3.3
-readonly MACHINE_VERSION=v0.3.0
+readonly COMPOSE_VERSION=1.4.0
+readonly MACHINE_VERSION=v0.4.0
 
-readonly DOCKVIZ_VERSION=v0.2
+readonly DOCKVIZ_VERSION=v0.2.1
 readonly DOCKVIZ_EXE_URL=https://github.com/justone/dockviz/releases/download/$DOCKVIZ_VERSION/dockviz_linux_amd64
 
 readonly DOCKERGEN_VERSION=0.4.0

diff --git a/ubuntu-trusty/vagrant-provision.sh b/ubuntu-trusty/vagrant-provision.sh
@@ -14,10 +14,10 @@ export LANG=en_US.UTF-8
 export LANGUAGE=en_US.UTF-8
 
 
-readonly COMPOSE_VERSION=1.3.3
-readonly MACHINE_VERSION=v0.3.0
+readonly COMPOSE_VERSION=1.4.0
+readonly MACHINE_VERSION=v0.4.0
 
-readonly DOCKVIZ_VERSION=v0.2
+readonly DOCKVIZ_VERSION=v0.2.1
 readonly DOCKVIZ_EXE_URL=https://github.com/justone/dockviz/releases/download/$DOCKVIZ_VERSION/dockviz_linux_amd64
 
 readonly DOCKERGEN_VERSION=0.4.0