Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

.travis.yml

@@ -2,7 +2,6 @@ sudo: required
 language: node_js
 branches:
   only:
-  - master
   - develop
 node_js:
 - '0.12'
@@ -50,5 +49,4 @@ deploy:
   local_dir: ../build
   on:
     branch:
-    - master
     - develop

Dockerfile

@@ -3,12 +3,13 @@ FROM node:0.10
 MAINTAINER buildmaster@rocket.chat
 
 RUN apt-get update \
-&& apt-get install -y graphicsmagick \
-&& rm -rf /var/lib/apt/lists/*
+&&  apt-get install -y graphicsmagick \
+&&  rm -rf /var/lib/apt/lists/*
 
 RUN groupadd -r rocketchat \
 &&  useradd -r -g rocketchat rocketchat \
-&&  mkdir /app
+&&  mkdir /app  \
+&&  mkdir /app/uploads
 
 # gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <buildmaster@rocket.chat>" imported
 RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104
@@ -21,13 +22,16 @@ RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/rocket.chat-v.latest.tgz
 &&  cd /app/bundle/programs/server \
 &&  npm install
 
-WORKDIR /app/bundle
 USER rocketchat
 
-# needs a mongoinstance - defaults to container linking with alias 'db'
-ENV MONGO_URL=mongodb://db:27017/meteor \
+VOLUME /app/uploads
+WORKDIR /app/bundle
+
+# needs a mongoinstance - defaults to container linking with alias 'mongo'
+ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
     PORT=3000 \
-    ROOT_URL=http://localhost:3000
+    ROOT_URL=http://localhost:3000 \
+    Accounts_AvatarStorePath=/app/uploads
 
 EXPOSE 3000
 CMD ["node", "main.js"]

docker-compose.yml

-db:
+mongo:
   image: mongo
 # volumes:
-#    - ./data/runtime/db:/data/db
+#    - ./data/runtime/mongo:/data/mongo
 #    - ./data/dump:/dump
   command: mongod --smallfiles
 
 rocketchat:
   image: rocketchat/rocket.chat
+# volumes:
+#    - ./uploads:/app/uploads
   environment:
-    - MONGO_URL=mongodb://db:27017/rocketchat
-    - ROOT_URL=http://yourhost:8818
+    - ROOT=3000
+    - ROOT_URL=http://yourhost:3000
+    - MONGO_URL=mongodb://mongo:27017/rocketchat
   links:
-    - db:db
+    - mongo:mongo
   ports:
-    - 8818:3000
+    - 3000:3000