forked from RocketChat/Rocket.Chat
-
Notifications
You must be signed in to change notification settings - Fork 3
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 #676 from assistify/release/3.2.2
Release 3.2.2 & Chatpal
- Loading branch information
Showing
1,088 changed files
with
44,606 additions
and
16,435 deletions.
There are no files selected for viewing
File renamed without changes.
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 |
---|---|---|
@@ -1,24 +1,24 @@ | ||
FROM rocketchat/base:12.14.0 | ||
FROM rocketchat/base:12.16.1 | ||
|
||
ADD . /app | ||
ADD entrypoint.sh /app/bundle/ | ||
|
||
MAINTAINER [email protected] | ||
LABEL maintainer="[email protected]" | ||
|
||
RUN set -x \ | ||
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \ | ||
&& apt-get update \ | ||
&& apt-get install -y wget \ | ||
&& wget -qO - https://www.mongodb.org/static/pgp/server-4.0.asc | apt-key add - \ | ||
&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list \ | ||
&& apt-get update \ | ||
&& apt-get install -y --force-yes pwgen mongodb-org \ | ||
&& echo "mongodb-org hold" | dpkg --set-selections \ | ||
&& echo "mongodb-org-server hold" | dpkg --set-selections \ | ||
&& echo "mongodb-org-shell hold" | dpkg --set-selections \ | ||
&& echo "mongodb-org-mongos hold" | dpkg --set-selections \ | ||
&& echo "mongodb-org-tools hold" | dpkg --set-selections \ | ||
&& apt-get install -y pwgen mongodb-org \ | ||
&& apt-get clean my room | ||
|
||
ADD . /app | ||
ADD entrypoint.sh /app/bundle/ | ||
|
||
RUN set -x \ | ||
&& cd /app/bundle/programs/server \ | ||
&& npm install \ | ||
&& npm cache clear --force \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
&& chown -R rocketchat:rocketchat /app | ||
|
||
VOLUME /app/uploads | ||
|
||
|
@@ -28,6 +28,7 @@ WORKDIR /app/bundle | |
ENV DEPLOY_METHOD=docker-preview \ | ||
NODE_ENV=production \ | ||
MONGO_URL=mongodb://localhost:27017/rocketchat \ | ||
MONGO_OPLOG_URL=mongodb://localhost:27017/local \ | ||
HOME=/tmp \ | ||
PORT=3000 \ | ||
ROOT_URL=http://localhost:3000 \ | ||
|
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 |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM rocketchat/base:12.14.0 | ||
FROM rocketchat/base:12.16.1 | ||
|
||
ADD . /app | ||
|
||
|
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 |
---|---|---|
@@ -1,6 +1,6 @@ | ||
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7 | ||
|
||
ENV RC_VERSION 3.0.7 | ||
ENV RC_VERSION 3.2.2 | ||
|
||
MAINTAINER [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 |
---|---|---|
@@ -1,82 +1,5 @@ | ||
**/bin/** | ||
**/build/* | ||
**/node_modules/* | ||
**/tmp/* | ||
**/.meteor/.id | ||
**/.meteor/dev_bundle | ||
**/.meteor/local* | ||
**/.meteor/meteorite | ||
/private/certs/* | ||
*.bak | ||
*.iml | ||
*.ipr | ||
*.iws | ||
*.launch | ||
*.log | ||
*.pydevproject | ||
*.sublime-project | ||
*.sublime-workspace | ||
*.swp | ||
*.tmp | ||
*.tokens | ||
*.un~ | ||
*~ | ||
*~.nib | ||
.*.sw[a-z] | ||
.\#* | ||
._* | ||
.buildpath | ||
.classpath | ||
.clover | ||
.cproject | ||
.DS_Store | ||
.elasticbeanstalk | ||
.elc | ||
.emacs.desktop | ||
.emacs.desktop.lock | ||
.env | ||
.externalToolBuilders | ||
.git | ||
.gitignore | ||
.idea | ||
.vscode | ||
.loadpath | ||
.map | ||
.metadata | ||
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js | ||
.mule | ||
.pmd | ||
.project | ||
.sass-cache | ||
.settings | ||
.Spotlight-V100 | ||
tatus | ||
.Trashes | ||
.wtpmodules | ||
\#*\# | ||
Desktop.ini | ||
docker-compose.yml | ||
ehthumbs.db | ||
example.css | ||
jrat.output | ||
jrat.xml | ||
local.properties | ||
meteor-vulcanize | ||
nb-configuration.xml | ||
nbactions.xml | ||
nbproject | ||
profiles.xml | ||
Session.vim | ||
smart.lock | ||
temp_* | ||
Thumbs.db | ||
thumbs.db | ||
tramp | ||
ecosystem.json | ||
pm2.json | ||
settings.json | ||
build.sh | ||
/public/livechat | ||
packages/rocketchat-i18n/i18n/livechat.* | ||
tests/end-to-end/temporary_staged_test | ||
.screenshots | ||
LICENSE | ||
README.md | ||
docker-compose.yml |
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.