Skip to content

Commit

Permalink
Merge pull request RocketChat#313 from assistify/port/0.63
Browse files Browse the repository at this point in the history
Update RC to 0.63
  • Loading branch information
mrsimpson authored Apr 17, 2018
2 parents c2071eb + 5e0d896 commit 5d0f544
Show file tree
Hide file tree
Showing 265 changed files with 77,949 additions and 7,405 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
tar czf /tmp/build/Rocket.Chat.tar.gz bundle
cd /tmp/build-test/bundle/programs/server
npm install
npm install pseudomap
# - save_cache:
# key: node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
Expand Down Expand Up @@ -269,7 +270,7 @@ jobs:
deploy:
<<: *defaults
docker:
- image: circleci/node:4.8
- image: circleci/node:8

steps:
- attach_workspace:
Expand Down
1 change: 1 addition & 0 deletions .circleci/snap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ git clone -b $SNAP_CHANNEL git+ssh://rocket.chat.buildmaster@git.launchpad.net/r
# Rarely will change, but just incase we copy it all
cp -r resources buildinfo launchpad/
sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml
sed s/#{RC_VERSION}/$RC_VERSION/ resources/prepareRocketChat > launchpad/resources/prepareRocketChat

cd launchpad
git add resources snapcraft.yaml buildinfo
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM rocketchat/base:8

ENV RC_VERSION 0.62.2
ENV RC_VERSION 0.63.2

MAINTAINER buildmaster@rocket.chat

Expand Down
44 changes: 44 additions & 0 deletions .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

ENV RC_VERSION 0.63.2

MAINTAINER buildmaster@rocket.chat

LABEL name="Rocket.Chat" \
vendor="Rocket.Chat" \
version="${RC_VERSION}" \
release="1" \
url="https://rocket.chat" \
summary="The Ultimate Open Source Web Chat Platform" \
description="The Ultimate Open Source Web Chat Platform" \
run="docker run -d --name ${NAME} ${IMAGE}"


# This is ugly... But for some reason npm and node aren't available at this stage.
ENV PATH /opt/rh/rh-nodejs8/root/usr/bin:/opt/app-root/src/node_modules/.bin/:/opt/app-root/src/.npm-global/bin/:/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

RUN set -x \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download" -o rocket.chat.tgz \
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
&& gpg --verify rocket.chat.tgz.asc \
&& tar -zxf rocket.chat.tgz -C /opt/app-root/src/ \
&& cd /opt/app-root/src/bundle/programs/server \
&& npm install

COPY licenses /licenses

VOLUME /opt/app-root/src/uploads

WORKDIR /opt/app-root/src/bundle

ENV DEPLOY_METHOD=docker-redhat \
NODE_ENV=production \
MONGO_URL=mongodb://mongo:27017/rocketchat \
HOME=/tmp \
PORT=3000 \
ROOT_URL=http://localhost:3000

EXPOSE 3000

CMD ["node", "main.js"]
22 changes: 22 additions & 0 deletions .docker/licenses/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The MIT License (MIT)

Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

4 changes: 3 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ packages/rocketchat-videobridge/client/public/external_api.js
packages/rocketchat-theme/client/vendor/
private/moment-locales/
public/livechat/
public/recorderWorker.js
public/mp3-realtime-worker.js
public/lame.min.js
!.scripts
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
"Promise" : false,
"Random" : false,
"ReactiveVar" : false,
"Reload" : false,
"RocketChat" : true,
"RocketChatFile" : false,
"RoomHistoryManager" : false,
Expand Down
15 changes: 15 additions & 0 deletions .github/history-manual.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"0.55.0": [{
"title": "[BREAK] `getUsersOfRoom` API to return array of objects with user and username, instead of array of strings",
"userLogin": "rodrigok",
"contributors": []
}, {
"title": "[FIX] Incoming integrations would break when trying to use the `Store` feature.`",
"userLogin": "rodrigok",
"contributors": []
}, {
"title": "[FIX] Removed Deprecated Package rocketchat:sharedsecret`",
"userLogin": "rodrigok",
"contributors": []
}]
}
Loading

0 comments on commit 5d0f544

Please sign in to comment.