Merge branch 'master' into feature/docker

plugins/docker-machine/README.md

@@ -1,5 +1,27 @@
+
 ## docker-machine autocomplete plugin
 
 A copy of the completion script from the
 [docker](https://github.com/docker/machine/blob/master/contrib/completion/zsh/_docker-machine)
 git repo.
+
+# docker-machine plugin for oh my zsh
+
+### Usage
+
+#### docker-vm
+Will create a docker-machine with the name "dev" (required only once)
+To create a second machine call "docker-vm foobar" or pass any other name
+
+#### docker-up
+This will start your "dev" docker-machine (if necessary) and set it as the active one
+To start a named machine use "docker-up foobar"
+
+#### docker-switch dev
+Use this to activate a running docker-machine (or to switch between multiple machines)
+You need to call either this or docker-up when opening a new terminal
+
+#### docker-stop
+This will stop your "dev" docker-machine
+To stop a named machine use "docker-stop foobar"
+

plugins/docker-machine/docker-machine.plugin.zsh

@@ -0,0 +1,33 @@
+DEFAULT_MACHINE="default"
+
+docker-up() {
+    if [ -z "$1" ]
+    then
+        docker-machine start "${DEFAULT_MACHINE}"
+        eval $(docker-machine env "${DEFAULT_MACHINE}")
+    else
+        docker-machine start $1
+        eval $(docker-machine env $1)
+    fi
+    echo $DOCKER_HOST
+}
+docker-stop() {
+    if [ -z "$1" ]
+    then
+        docker-machine stop "${DEFAULT_MACHINE}"
+    else
+        docker-machine stop $1
+    fi
+}
+docker-switch() {
+    eval $(docker-machine env $1)
+    echo $DOCKER_HOST
+}
+docker-vm() {
+    if [ -z "$1" ]
+    then
+        docker-machine create -d virtualbox --virtualbox-disk-size 20000 --virtualbox-memory 4096 --virtualbox-cpu-count 2 "${DEFAULT_MACHINE}"
+    else
+        docker-machine create -d virtualbox --virtualbox-disk-size 20000 --virtualbox-memory 4096 --virtualbox-cpu-count 2 $1
+    fi
+}