Skip to content
Snippets Groups Projects
Commit 787569d6 authored by Rodrigo Nascimento's avatar Rodrigo Nascimento
Browse files

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

parents eef7838f d4839952
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.travis.yml
+ 0
− 2
View file @ 787569d6
...@@ -2,7 +2,6 @@ sudo: required ...@@ -2,7 +2,6 @@ sudo: required
language: node_js language: node_js
branches: branches:
only: only:
- master
- develop - develop
node_js: node_js:
- '0.12' - '0.12'
...@@ -50,5 +49,4 @@ deploy: ...@@ -50,5 +49,4 @@ deploy:
local_dir: ../build local_dir: ../build
on: on:
branch: branch:
- master
- develop - develop
Dockerfile
+ 11
− 7
View file @ 787569d6
...@@ -3,12 +3,13 @@ FROM node:0.10 ...@@ -3,12 +3,13 @@ FROM node:0.10
MAINTAINER buildmaster@rocket.chat MAINTAINER buildmaster@rocket.chat
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y graphicsmagick \ && apt-get install -y graphicsmagick \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN groupadd -r rocketchat \ RUN groupadd -r rocketchat \
&& useradd -r -g rocketchat 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 # gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <buildmaster@rocket.chat>" imported
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 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 ...@@ -21,13 +22,16 @@ RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/rocket.chat-v.latest.tgz
&& cd /app/bundle/programs/server \ && cd /app/bundle/programs/server \
&& npm install && npm install
WORKDIR /app/bundle
USER rocketchat USER rocketchat
# needs a mongoinstance - defaults to container linking with alias 'db' VOLUME /app/uploads
ENV MONGO_URL=mongodb://db:27017/meteor \ WORKDIR /app/bundle
# needs a mongoinstance - defaults to container linking with alias 'mongo'
ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
PORT=3000 \ PORT=3000 \
ROOT_URL=http://localhost:3000 ROOT_URL=http://localhost:3000 \
Accounts_AvatarStorePath=/app/uploads
EXPOSE 3000 EXPOSE 3000
CMD ["node", "main.js"] CMD ["node", "main.js"]
docker-compose.yml
+ 9
− 6
View file @ 787569d6
db: mongo:
image: mongo image: mongo
# volumes: # volumes:
# - ./data/runtime/db:/data/db # - ./data/runtime/mongo:/data/mongo
# - ./data/dump:/dump # - ./data/dump:/dump
command: mongod --smallfiles command: mongod --smallfiles
rocketchat: rocketchat:
image: rocketchat/rocket.chat image: rocketchat/rocket.chat
# volumes:
# - ./uploads:/app/uploads
environment: environment:
- MONGO_URL=mongodb://db:27017/rocketchat - ROOT=3000
- ROOT_URL=http://yourhost:8818 - ROOT_URL=http://yourhost:3000
- MONGO_URL=mongodb://mongo:27017/rocketchat
links: links:
- db:db - mongo:mongo
ports: ports:
- 8818:3000 - 3000:3000
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment