Update versions and add Docker Machine

prepare-vms/postprep.rc

@@ -28,9 +28,11 @@ while addresses:
 
 os.system("sudo apt-get -qy install python-setuptools pssh apache2-utils httping htop")
 os.system("sudo easy_install pip")
-os.system("sudo pip install docker-compose==1.3.2")
-os.system("docker pull swarm:0.3.0")
-os.system("docker tag -f swarm:0.3.0 swarm")
+os.system("sudo pip install docker-compose==1.4.1")
+os.system("docker pull swarm:0.4.0")
+os.system("docker tag -f swarm:0.4.0 swarm")
+os.system("sudo curl -L https://github.com/docker/machine/releases/download/v0.4.1/docker-machine_linux-amd64 -o /usr/local/bin/docker-machine")
+os.system("sudo chmod +x /usr/local/bin/docker-machine")
 os.system("echo 1000000 | sudo tee /proc/sys/net/nf_conntrack_max")
 os.system("""sudo sed -i 's,^DOCKER_OPTS=.*,DOCKER_OPTS="-H unix:///var/run/docker.sock -H tcp://0.0.0.0:55555",' /etc/default/docker""")
 os.system("sudo service docker restart")

www/htdocs/index.html

@@ -168,11 +168,13 @@ to be done from the first VM, `node1`.
 
 ## Brand new versions!
 
-- Docker 1.7
+- Docker 1.8.2
 
-- Compose 1.3.2
+- Compose 1.4.1
 
-- Swarm 0.3
+- Swarm 0.4
+
+- Machine 0.4.1
 
 ---
 
@@ -1285,7 +1287,7 @@ class: title
 
 # Swarm (in practice)
 
-- Not stable yet (version 0.3 right now)
+- Not stable yet (version 0.4 right now)
 
 - OK for some scenarios (Jenkins, grid...)