Merge pull request wsargent#28 from jalateras/machine-swarm-compose

Machine swarm compose
jasonADP · Mar 9, 2015 · cf2f2be · cf2f2be
2 parents c96d1a3 + 1ae3e09
commit cf2f2be
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ NOTE: This used to be a gist that continually expanded.  It's now a github proje
 * [Links](https://github.com/wsargent/docker-cheat-sheet#links)
 * [Volumes](https://github.com/wsargent/docker-cheat-sheet#volumes)
 * [Exposing Ports](https://github.com/wsargent/docker-cheat-sheet#exposing-ports)
+* [Machine, Swarm and Compose](https://github.com/wsargent/docker-cheat-sheet#machines-swarm--and-compose)
 * [Best Practices](https://github.com/wsargent/docker-cheat-sheet#best-practices)
 * [Tips](https://github.com/wsargent/docker-cheat-sheet#tips)
 * [Tools](https://github.com/wsargent/docker-cheat-sheet#tools)
@@ -322,6 +323,19 @@ If you forget what you mapped the port to on the host container, use `docker por
 docker port CONTAINER $CONTAINERPORT
 ```
 
+## Machines, Swarm  and Compose
+In early 2015 Docker developed and open sourced a number of components that use the Docker API to provide some higher level services.
+
+* [Machine](https://docs.docker.com/machine/), is a tool for easily creatinf a docker host either locally or on cloud provider (i.e. AWS, Digital Ocean etc).
+* [Swarm](https://docs.docker.com/swarm/), is clustering for docker. It provides a way to group a number of docker hosts into a single virtual entity and provides 
+mechanisms to schedule containers across these hosts.
+* [Compose](https://docs.docker.com/compose/), provides a tool for describing a multi-container application within a single file. Compose primarily Fig renamed.
+
+The [Demo of the Machine + Swarm + Compose integration](https://www.youtube.com/watch?v=M4PFY6RZQHQ) video provides a good introduction to the 
+various components and how they work together.
+
+
+
 ## Tips
 
 Sources: