From 7a837382c2859837ab54ec3c5888f1dc5d01c54c Mon Sep 17 00:00:00 2001
From: Mike <mike.michel@mmbash.de>
Date: Fri, 14 Aug 2015 10:16:20 +0200
Subject: [PATCH 1/6] docker oneliner for dev and quickstarting

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 5dfcf8b406296..e61bb3fa3bec5 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,8 @@ Use the automated build at our [Official Docker Registry](https://registry.hub.d
 docker pull rocketchat/rocket.chat
 ```
 
+
+
 ### Heroku
 
 Host your own Rocket.Chat server for **FREE** with [One-Click Deploy](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
@@ -133,6 +135,14 @@ cd Rocket.Chat
 meteor
 ```
 
+or use docker:
+
+```
+git clone https://github.com/RocketChat/Rocket.Chat.git
+cd Rocket.Chat
+docker run -it --rm -p 3000:3000 -v "$(pwd)":/app danieldent/meteor
+```
+
 ## Credits
 
 Thanks to

From 1f652f72e44bcf430df98bfdd0fe772e8e9c254c Mon Sep 17 00:00:00 2001
From: Mike <mike.michel@mmbash.de>
Date: Fri, 14 Aug 2015 10:32:37 +0200
Subject: [PATCH 2/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e61bb3fa3bec5..9da7aa1fa6b01 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ or use docker:
 ```
 git clone https://github.com/RocketChat/Rocket.Chat.git
 cd Rocket.Chat
-docker run -it --rm -p 3000:3000 -v "$(pwd)":/app danieldent/meteor
+docker run -it -p 3000:3000 -v "$(pwd)":/app danieldent/meteor
 ```
 
 ## Credits

From 87172d205cb05b9a39c2a9925ef8337f2ed1d3ba Mon Sep 17 00:00:00 2001
From: Mike <mike.michel@mmbash.de>
Date: Fri, 14 Aug 2015 10:39:04 +0200
Subject: [PATCH 3/6] add docker-compose.yml

---
 docker-compose.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000000..306491bdf6ac4
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,14 @@
+rocketchat:
+  image: rocketchat/rocket.chat
+  environment:
+    - MONGO_URL=mongodb://mongodb/rocketchat
+    - ROOT_URL=http://localhost:80
+  links:
+    - mongodb
+  ports:
+    - 80:80
+
+mongodb:
+   image: mongo
+   ports:
+     - 27017

From 0d81f682599183895a4b83e38d8090edbdfcd4f7 Mon Sep 17 00:00:00 2001
From: Mike <mike.michel@mmbash.de>
Date: Fri, 14 Aug 2015 10:40:59 +0200
Subject: [PATCH 4/6] add .dockerignore

---
 .dockerignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000000..594684228cd06
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+.git
+.gitignore
+LICENSE
+README.md
+docker-compose.yml
\ No newline at end of file

From 750be23676e066c3c415682d34524290c4f48597 Mon Sep 17 00:00:00 2001
From: Mike <mike.michel@mmbash.de>
Date: Fri, 14 Aug 2015 11:00:09 +0200
Subject: [PATCH 5/6] compose and sloppy.io

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 9da7aa1fa6b01..c414921d45596 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,14 @@ The Complete Open Source Chat Solution
 
 Checkout the latest version at [https://demo.rocket.chat](https://demo.rocket.chat)
 
+Try it with docker:
+
+```
+docker-compose up
+```
+
+and check it out at http://localhost:80
+
 Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron](https://github.com/RocketChat/Rocket.Chat.Electron/releases)
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=49QX7TYCVZK8L)
@@ -120,6 +128,10 @@ Host your own Rocket.Chat server for **FREE** with [One-Click Deploy](https://he
 
 [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
 
+### sloppy.io
+
+
+
 ## Development Installation
 
 Prerequisites:

From cac4c1fd19f50d68e17f35f58664b01a1747788e Mon Sep 17 00:00:00 2001
From: Mike <mike.michel@mmbash.de>
Date: Fri, 14 Aug 2015 11:00:55 +0200
Subject: [PATCH 6/6] sloppy.io

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c414921d45596..c869fee8d41f5 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,9 @@ Use the automated build at our [Official Docker Registry](https://registry.hub.d
 docker pull rocketchat/rocket.chat
 ```
 
+### sloppy.io
 
+Host your docker container at [sloppy.io](http://sloppy.io). Get an account and use the [quickstarter](https://github.com/sloppyio/quickstarters/tree/master/rocketchat)
 
 ### Heroku
 
@@ -128,8 +130,6 @@ Host your own Rocket.Chat server for **FREE** with [One-Click Deploy](https://he
 
 [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
 
-### sloppy.io
-
 
 
 ## Development Installation