-
Notifications
You must be signed in to change notification settings - Fork 10.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1655 from RocketChat/develop
Update master from develop
- Loading branch information
Showing
256 changed files
with
4,444 additions
and
733 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
FROM node:0.10 | ||
|
||
MAINTAINER [email protected] | ||
|
||
RUN apt-get update \ | ||
&& apt-get install -y graphicsmagick \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
|
||
RUN groupadd -r rocketchat \ | ||
&& useradd -r -g rocketchat rocketchat \ | ||
&& mkdir /app \ | ||
&& mkdir /app/uploads | ||
|
||
# gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <[email protected]>" imported | ||
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 | ||
|
||
WORKDIR /app | ||
|
||
RUN URL="https://github.com/RocketChat/Rocket.Chat/releases/latest" \ | ||
&& FILE="/rocket.chat.tgz" \ | ||
&& HEADER=$(curl -I -s "$URL" | grep -Fi Location: | sed -En 's/.*(https?:\/\/[a-zA-Z0-9\/.-_]*).*$/\1/p') \ | ||
&& curl -fSL "$HEADER$FILE" -o rocket.chat.tgz \ | ||
&& tar zxvf ./rocket.chat.tgz \ | ||
&& rm ./rocket.chat.tgz \ | ||
&& cd /app/bundle/programs/server \ | ||
&& npm install | ||
|
||
USER rocketchat | ||
|
||
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 \ | ||
Accounts_AvatarStorePath=/app/uploads | ||
|
||
EXPOSE 3000 | ||
CMD ["node", "main.js"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -107,7 +107,7 @@ [email protected] | |
pauli:[email protected] | ||
pauli:[email protected] | ||
perak:[email protected] | ||
percolate:[email protected].6 | ||
percolate:[email protected].7 | ||
percolate:[email protected] | ||
pntbr:[email protected] | ||
[email protected] | ||
|
@@ -135,13 +135,15 @@ rocketchat:[email protected] | |
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
rocketchat:[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
# Publish commands | ||
|
||
``` | ||
cd Rocket.Chat | ||
vagrant-spk up && vagrant-spk dev | ||
^C | ||
vagrant-spk pack ../rocketchat.spk && vagrant-spk publish ../rocketchat.spk | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.