Skip to content

Commit 5aa08cb

Browse files
rodrigokrodrigok
authored
Merge pull request #11278 from RocketChat/release-0.66.0
Release 0.66.0
2 parents 706a528 + 0800ab0 commit 5aa08cb

File tree

420 files changed

+65936
-35328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

420 files changed

+65936
-35328
lines changed

‎.circleci/config.yml‎

Lines changed: 145 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,12 @@ jobs:
152152
- run:
153153
name: Install dependencies
154154
command: |
155+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
155156
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
157+
echo "deb [ arch=amd64 ] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
156158
echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
157159
sudo apt-get update
158-
sudo apt-get install -y mongodb-org-shell
160+
sudo apt-get install -y mongodb-org-shell google-chrome-stable
159161
160162
- run:
161163
name: Configure Replica Set
@@ -192,6 +194,14 @@ jobs:
192194

193195
- checkout
194196

197+
- run:
198+
name: Install dependencies
199+
command: |
200+
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
201+
echo "deb [ arch=amd64 ] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
202+
sudo apt-get update
203+
sudo apt-get install -y google-chrome-stable
204+
195205
- run:
196206
name: NPM install
197207
command: |
@@ -245,10 +255,118 @@ jobs:
245255
aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive
246256
247257
bash .circleci/update-releases.sh
248-
bash .circleci/docker.sh
249258
bash .circleci/snap.sh
250259
bash .circleci/redhat-registry.sh
251260
261+
image-build:
262+
<<: *defaults
263+
264+
docker:
265+
- image: docker:17.05.0-ce-git
266+
267+
steps:
268+
- attach_workspace:
269+
at: /tmp
270+
271+
- checkout
272+
273+
- setup_remote_docker
274+
275+
- run:
276+
name: Build Docker image
277+
command: |
278+
cd /tmp/build
279+
tar xzf Rocket.Chat.tar.gz
280+
rm Rocket.Chat.tar.gz
281+
282+
export CIRCLE_TAG=${CIRCLE_TAG:=}
283+
if [[ $CIRCLE_TAG ]]; then
284+
docker login -u $DOCKER_USER -p $DOCKER_PASS
285+
286+
echo "Build official Docker image"
287+
cp ~/repo/.docker/Dockerfile .
288+
docker build -t rocketchat/rocket.chat:$CIRCLE_TAG .
289+
docker push rocketchat/rocket.chat:$CIRCLE_TAG
290+
291+
echo "Build preview Docker image"
292+
cp ~/repo/.docker-mongo/Dockerfile .
293+
cp ~/repo/.docker-mongo/entrypoint.sh .
294+
docker build -t rocketchat/rocket.chat.preview:$CIRCLE_TAG .
295+
docker push rocketchat/rocket.chat.preview:$CIRCLE_TAG
296+
297+
if echo "$CIRCLE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
298+
docker tag rocketchat/rocket.chat:$CIRCLE_TAG rocketchat/rocket.chat:latest
299+
docker push rocketchat/rocket.chat:latest
300+
301+
docker tag rocketchat/rocket.chat.preview:$CIRCLE_TAG rocketchat/rocket.chat.preview:latest
302+
docker push rocketchat/rocket.chat.preview:latest
303+
elif echo "$CIRCLE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
304+
docker tag rocketchat/rocket.chat:$CIRCLE_TAG rocketchat/rocket.chat:release-candidate
305+
docker push rocketchat/rocket.chat:release-candidate
306+
307+
docker tag rocketchat/rocket.chat.preview:$CIRCLE_TAG rocketchat/rocket.chat.preview:release-candidate
308+
docker push rocketchat/rocket.chat.preview:release-candidate
309+
fi
310+
311+
exit 0
312+
fi;
313+
314+
if [[ $CIRCLE_BRANCH == 'develop' ]]; then
315+
docker login -u $DOCKER_USER -p $DOCKER_PASS
316+
317+
echo "Build official Docker image"
318+
cp ~/repo/.docker/Dockerfile .
319+
docker build -t rocketchat/rocket.chat:develop .
320+
docker push rocketchat/rocket.chat:develop
321+
322+
echo "Build preview Docker image"
323+
cp ~/repo/.docker-mongo/Dockerfile .
324+
cp ~/repo/.docker-mongo/entrypoint.sh .
325+
docker build -t rocketchat/rocket.chat.preview:develop .
326+
docker push rocketchat/rocket.chat.preview:develop
327+
328+
exit 0
329+
fi;
330+
331+
pr-image-build:
332+
<<: *defaults
333+
334+
docker:
335+
- image: docker:17.05.0-ce-git
336+
337+
steps:
338+
- attach_workspace:
339+
at: /tmp
340+
341+
- checkout
342+
343+
- setup_remote_docker
344+
345+
- run:
346+
name: Build Docker image for PRs
347+
command: |
348+
export CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"
349+
if [[ -z $CIRCLE_PR_NUMBER ]]; then
350+
exit 0
351+
fi;
352+
353+
cd /tmp/build
354+
tar xzf Rocket.Chat.tar.gz
355+
rm Rocket.Chat.tar.gz
356+
357+
docker login -u $DOCKER_USER -p $DOCKER_PASS
358+
359+
echo "Build official Docker image"
360+
cp ~/repo/.docker/Dockerfile .
361+
docker build -t rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER .
362+
docker push rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER
363+
364+
echo "Build preview Docker image"
365+
cp ~/repo/.docker-mongo/Dockerfile .
366+
cp ~/repo/.docker-mongo/entrypoint.sh .
367+
docker build -t rocketchat/rocket.chat.preview:pr-$CIRCLE_PR_NUMBER .
368+
docker push rocketchat/rocket.chat.preview:pr-$CIRCLE_PR_NUMBER
369+
252370
workflows:
253371
version: 2
254372
build-and-test:
@@ -278,4 +396,29 @@ workflows:
278396
only: develop
279397
tags:
280398
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
399+
- image-build:
400+
requires:
401+
- deploy
402+
filters:
403+
branches:
404+
only: develop
405+
tags:
406+
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
407+
- hold:
408+
type: approval
409+
requires:
410+
- build
411+
filters:
412+
branches:
413+
ignore: develop
414+
tags:
415+
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
416+
- pr-image-build:
417+
requires:
418+
- hold
419+
filters:
420+
branches:
421+
ignore: develop
422+
tags:
423+
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
281424

‎.circleci/setartname.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ elif [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
1515
else
1616
SNAP_CHANNEL=edge
1717
RC_RELEASE=develop
18-
RC_VERSION=0.60.0-develop
18+
RC_VERSION=0.66.0-develop
1919
fi
2020

2121
export SNAP_CHANNEL

‎.docker-mongo/Dockerfile‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
FROM rocketchat/base:8
2+
3+
ADD . /app
4+
ADD entrypoint.sh /app/bundle/
5+
6+
MAINTAINER [email protected]
7+
8+
RUN set -x \
9+
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
10+
&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list \
11+
&& apt-get update \
12+
&& apt-get install -y --force-yes pwgen mongodb-org \
13+
&& echo "mongodb-org hold" | dpkg --set-selections \
14+
&& echo "mongodb-org-server hold" | dpkg --set-selections \
15+
&& echo "mongodb-org-shell hold" | dpkg --set-selections \
16+
&& echo "mongodb-org-mongos hold" | dpkg --set-selections \
17+
&& echo "mongodb-org-tools hold" | dpkg --set-selections \
18+
&& cd /app/bundle/programs/server \
19+
&& npm install \
20+
&& npm cache clear --force \
21+
&& rm -rf /var/lib/apt/lists/*
22+
23+
VOLUME /app/uploads
24+
25+
WORKDIR /app/bundle
26+
27+
# needs a mongoinstance - defaults to container linking with alias 'mongo'
28+
ENV DEPLOY_METHOD=docker-preview \
29+
NODE_ENV=production \
30+
MONGO_URL=mongodb://localhost:27017/rocketchat \
31+
HOME=/tmp \
32+
PORT=3000 \
33+
ROOT_URL=http://localhost:3000 \
34+
Accounts_AvatarStorePath=/app/uploads
35+
36+
EXPOSE 3000
37+
38+
RUN chmod +x /app/bundle/entrypoint.sh
39+
40+
ENTRYPOINT /app/bundle/entrypoint.sh

‎.docker-mongo/entrypoint.sh‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
echo """
4+
██████╗ ██████╗ ██████╗██╗ ██╗███████╗████████╗ ██████╗██╗ ██╗ █████╗ ████████╗ ██████╗ ██████╗ ███████╗██╗ ██╗██╗███████╗██╗ ██╗
5+
██╔══██╗██╔═══██╗██╔════╝██║ ██╔╝██╔════╝╚══██╔══╝██╔════╝██║ ██║██╔══██╗╚══██╔══╝ ██╔══██╗██╔══██╗██╔════╝██║ ██║██║██╔════╝██║ ██║
6+
██████╔╝██║ ██║██║ █████╔╝ █████╗ ██║ ██║ ███████║███████║ ██║ ██████╔╝██████╔╝█████╗ ██║ ██║██║█████╗ ██║ █╗ ██║
7+
██╔══██╗██║ ██║██║ ██╔═██╗ ██╔══╝ ██║ ██║ ██╔══██║██╔══██║ ██║ ██╔═══╝ ██╔══██╗██╔══╝ ╚██╗ ██╔╝██║██╔══╝ ██║███╗██║
8+
██║ ██║╚██████╔╝╚██████╗██║ ██╗███████╗ ██║██╗╚██████╗██║ ██║██║ ██║ ██║ ██║ ██║ ██║███████╗ ╚████╔╝ ██║███████╗╚███╔███╔╝
9+
╚═╝ ╚═╝ ╚═════╝ ╚═════╝╚═╝ ╚═╝╚══════╝ ╚═╝╚═╝ ╚═════╝╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚══════╝ ╚═══╝ ╚═╝╚══════╝ ╚══╝╚══╝
10+
"""
11+
12+
mongod --smallfiles --storageEngine=mmapv1 --fork --config /etc/mongod.conf
13+
14+
until mongo --eval "db" &> /dev/null; do
15+
echo "MongoDB still not ready, sleeping"
16+
sleep 1
17+
done
18+
19+
node main.js

‎.docker-mongo/licenses/LICENSE‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

‎.docker/Dockerfile‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
FROM rocketchat/base:8
22

3-
ENV RC_VERSION 0.65.2
3+
ADD . /app
44

55
MAINTAINER [email protected]
66

77
RUN set -x \
8-
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download/" -o rocket.chat.tgz \
9-
&& curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
10-
&& gpg --verify rocket.chat.tgz.asc \
11-
&& mkdir -p /app \
12-
&& tar -zxf rocket.chat.tgz -C /app \
13-
&& rm rocket.chat.tgz rocket.chat.tgz.asc \
148
&& cd /app/bundle/programs/server \
159
&& npm install \
1610
&& npm cache clear --force \

‎.docker/Dockerfile.rhel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
22

3-
ENV RC_VERSION 0.65.2
3+
ENV RC_VERSION 0.66.0
44

55
MAINTAINER [email protected]
66

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ packages/rocketchat-ui/client/lib/recorderjs/recorder.js
1515
packages/rocketchat-ui/client/lib/textarea-autogrow.js
1616
packages/rocketchat-videobridge/client/public/external_api.js
1717
packages/rocketchat-theme/client/vendor/
18+
packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
1819
private/moment-locales/
1920
public/livechat/
2021
public/mp3-realtime-worker.js

.github/ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
17
<!--
28
39
Please see our guide for opening issues: https://rocket.chat/docs/contributing/reporting-issues
@@ -10,22 +16,12 @@ If you are experiencing a bug please search our issues to be sure it is not alre
1016

1117
### Description:
1218

13-
<!-- Description of the issue -->
14-
15-
### Server Setup Information:
16-
17-
* Version of Rocket.Chat Server:
18-
* Operating System:
19-
* Deployment Method(snap/docker/tar/etc):
20-
* Number of Running Instances:
21-
* DB Replicaset Oplog:
22-
* Node Version:
23-
* mongoDB Version:
19+
<!-- A clear and concise description of what the bug is. -->
2420

25-
### Steps to Reproduce:
21+
### Steps to reproduce:
2622

27-
1. <!-- First Step -->
28-
2. <!-- Second Step -->
23+
1. <!-- Go to '...' -->
24+
2. <!-- Click on '....' -->
2925
3. <!-- and so on... -->
3026

3127
### Expected behavior:
@@ -34,8 +30,23 @@ If you are experiencing a bug please search our issues to be sure it is not alre
3430

3531
### Actual behavior:
3632

37-
<!-- What actually happens -->
33+
<!-- What actually happens with SCREENSHOT, if applicable -->
34+
35+
### Server Setup Information:
36+
37+
- Version of Rocket.Chat Server:
38+
- Operating System:
39+
- Deployment Method: <!-- snap/docker/tar/etc -->
40+
- Number of Running Instances:
41+
- DB Replicaset Oplog:
42+
- NodeJS Version:
43+
- MongoDB Version:
44+
45+
### Additional context
46+
47+
<!-- Add any other context about the problem here. -->
3848

3949
### Relevant logs:
40-
<!-- Logs from both server and browser -->
50+
51+
<!-- Logs from both SERVER and BROWSER -->
4152
<!-- For more information about collecting logs please see: https://rocket.chat/docs/contributing/reporting-issues#gathering-logs -->

‎.github/ISSUE_TEMPLATE/custom.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: Custom issue template
3+
about: Describe this issue template's purpose here.
4+
5+
---
6+
7+

0 commit comments

Comments
 (0)