Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Update Meteor to 2.5.3 #24075

Merged
merged 58 commits into from
Jan 14, 2022
Merged

Chore: Update Meteor to 2.5.3 #24075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
1d33164
Meteor update
sampaiodiego Dec 31, 2021
4f5c16b
Remove overwride of react-fast-refresh
sampaiodiego Dec 31, 2021
f722c52
Fix LivechatBusinessHoursRaw model
sampaiodiego Dec 31, 2021
3456005
Need fix: stop using HTTPInternals
sampaiodiego Dec 31, 2021
6958372
Need fix: async_hooks error
sampaiodiego Dec 31, 2021
4365d5e
Fix some lint issues
sampaiodiego Dec 31, 2021
7296689
Make eslint happy before rewrite
sampaiodiego Dec 31, 2021
68efae6
Copy code from LinkedIn auth packages
sampaiodiego Jan 3, 2022
54982ef
Use forked restivus
sampaiodiego Jan 3, 2022
5b467ef
Merge remote-tracking branch 'origin/develop' into update-meteor-2.5.2
sampaiodiego Jan 3, 2022
b30ba91
Ignore JS files in copied packages
sampaiodiego Jan 3, 2022
6eb02f0
Update Node version
sampaiodiego Jan 3, 2022
b80f8ba
Let's try debian bullseye
sampaiodiego Jan 3, 2022
c537a64
Skip failing test and add some TODOs
sampaiodiego Jan 3, 2022
34570ff
skip another test
sampaiodiego Jan 4, 2022
42d4299
Fix preview Dockerfile
sampaiodiego Jan 4, 2022
8cebcfd
Skip whole oembed
sampaiodiego Jan 4, 2022
32582d4
Add TODOs regarding npmRequestOptions
sampaiodiego Jan 4, 2022
910a5fc
Fix lint
sampaiodiego Jan 4, 2022
382c91b
Skip app's tests
sampaiodiego Jan 4, 2022
99bd5f3
Fix Dockerfile syntax
sampaiodiego Jan 4, 2022
cfa819d
Merge branch 'develop' into update-meteor-2.5.2
sampaiodiego Jan 5, 2022
ad5f566
Use meteor/fetch on apps routes
sampaiodiego Jan 5, 2022
5d359ca
Fix LGTM issues
sampaiodiego Jan 5, 2022
5ce67e9
Fix npmRequestOptions on getAvatarSuggestionForUser
sampaiodiego Jan 5, 2022
8d035a1
Fix npmRequestOptions from setUserAvatar
sampaiodiego Jan 5, 2022
3825c43
Fix oembed
sampaiodiego Jan 5, 2022
675b59f
Fix import for getAvatarSuggestionForUser
sampaiodiego Jan 5, 2022
437be6d
Fix LGTM
sampaiodiego Jan 5, 2022
f4bf9f6
test
ggazzo Jan 6, 2022
3598620
Fix set avatar permission check
sampaiodiego Jan 6, 2022
1ab091e
Use async
sampaiodiego Jan 6, 2022
61c1e78
Use meteor/fetch on webhooks
sampaiodiego Jan 6, 2022
6770901
Use meteor/fetch on SMS getUploadFile
sampaiodiego Jan 6, 2022
14feb9d
use await
sampaiodiego Jan 6, 2022
eee1c8a
Fix issues related to empty MAIL_URL
sampaiodiego Jan 6, 2022
28a6653
Fix logoutOtherClients
sampaiodiego Jan 6, 2022
86c09f2
Update to Meteor 2.5.3
sampaiodiego Jan 6, 2022
e31f011
Update dependencies used by new Meteor version
sampaiodiego Jan 6, 2022
44a1a3e
Fix users.logoutOtherClients endpoint result
sampaiodiego Jan 6, 2022
98fff9a
Revert "Update dependencies used by new Meteor version"
sampaiodiego Jan 6, 2022
3dbae75
Update dependencies again (other than TS)
sampaiodiego Jan 6, 2022
d846dfc
Merge remote-tracking branch 'origin/develop' into update-meteor-2.5.2
sampaiodiego Jan 6, 2022
38d510b
Merge remote-tracking branch 'origin/develop' into update-meteor-2.5.2
sampaiodiego Jan 10, 2022
2adc94a
Use fibers to store context
sampaiodiego Jan 10, 2022
bd18ec5
Add Fibers and Async Hooks implementation of ContextStore
sampaiodiego Jan 10, 2022
47f1894
Merge branch 'develop' into update-meteor-2.5.2
sampaiodiego Jan 10, 2022
96ad2dc
Convert App's HTTP bridge to use meteor/fetch
sampaiodiego Jan 10, 2022
03d2e15
Merge branch 'update-meteor-2.5.2' of https://github.com/RocketChat/R…
sampaiodiego Jan 10, 2022
b665425
Remove duplicates of getUnsafeAgent
sampaiodiego Jan 10, 2022
226b168
Fix new integration log no returning id
sampaiodiego Jan 10, 2022
1df2cb4
Fix integration response script
sampaiodiego Jan 10, 2022
1544a5e
Merge branch 'develop' into update-meteor-2.5.2
sampaiodiego Jan 12, 2022
07344e9
Fix Linkedin OAuth
sampaiodiego Jan 12, 2022
af58958
Fix non-downloadable SMS files
sampaiodiego Jan 12, 2022
e426409
Add Node and Mongo versions to release update request
sampaiodiego Jan 13, 2022
4644f91
Merge branch 'develop' into update-meteor-2.5.2
sampaiodiego Jan 13, 2022
6a46e57
Merge branch 'develop' into update-meteor-2.5.2
sampaiodiego Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .docker-mongo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
FROM node:12.22.8-buster-slim
FROM node:14.18.2-bullseye-slim

LABEL maintainer="[email protected]"

# Install MongoDB and dependencies
ENV MONGO_MAJOR 4.2
ENV MONGO_VERSION 4.2.10
ENV MONGO_MAJOR=5.0 \
MONGO_VERSION=5.0.5

RUN set -x \
&& apt-get update \
&& apt-get install -y wget gnupg dirmngr pwgen \
&& wget -qO - "https://www.mongodb.org/static/pgp/server-${MONGO_MAJOR}.asc" | apt-key add - \
&& echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/$MONGO_MAJOR main" | tee "/etc/apt/sources.list.d/mongodb-org-${MONGO_MAJOR}.list" \
&& wget -qO - "https://www.mongodb.org/static/pgp/server-$MONGO_MAJOR.asc" | apt-key add - \
&& echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/$MONGO_MAJOR main" | tee "/etc/apt/sources.list.d/mongodb-org-$MONGO_MAJOR.list" \
&& apt-get update \
&& apt-get install -y \
mongodb-org=$MONGO_VERSION \
mongodb-org-server=$MONGO_VERSION \
mongodb-org-shell=$MONGO_VERSION \
mongodb-org-mongos=$MONGO_VERSION \
mongodb-org-tools=$MONGO_VERSION \
fontconfig \
mongodb-org=$MONGO_VERSION \
mongodb-org-server=$MONGO_VERSION \
mongodb-org-shell=$MONGO_VERSION \
mongodb-org-mongos=$MONGO_VERSION \
mongodb-org-tools=$MONGO_VERSION \
fontconfig \
&& apt-get clean my room \
&& groupadd -g 65533 -r rocketchat \
&& useradd -u 65533 -r -g rocketchat rocketchat \
Expand All @@ -36,12 +36,12 @@ RUN aptMark="$(apt-mark showmanual)" \
&& apt-mark auto '.*' > /dev/null \
&& apt-mark manual $aptMark > /dev/null \
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
&& find /usr/local -type f -perm /111 -exec ldd '{}' ';' \

-executable doesn't exactly detect if a file is executable or not, since it uses the access syscall. It can potentially return all files (and dirs if no -type f) for a given directory. Since we are updating a lot of stuff in this pr already, let's also change it from this point.

I have not tested it yet, but this change shouldn't affect the image in any way.

Let me know if I'm misreading the purpose of this line 🙈

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"on behalf of" definitely not right 😬

Copy link
Member Author

@sampaiodiego sampaiodiego Jan 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have to say I don't know what that does 😅 it was copied from node's Dockerfile 🤷

https://github.com/nodejs/docker-node/blob/66b46292a6e5dd5856b1d5204dc51547c80eb17a/14/buster-slim/Dockerfile#L45

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks to me like it's making sure all npm/node dependencies are not accidentally removed when removing some other package with a similar dependency, thus not reducing/eliminating child image issues.

Also, looking at the Dockerfile, I'm not sure we even need those lines to be part of our image, do you remember why those were added initially? 🤔

Copy link
Member Author

@sampaiodiego sampaiodiego Jan 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this image specifically is not intended for production, we call is as "preview" since it has mongo installed and can be used to have a "preview" of a rocket.chat version.

we use the same technique on the production one though.. the ideia is to install some packages just to run the npm install and then clean it up..

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, looks like I commented on the wrong file, but these are part of our production one as well .docker/Dockerfile.

this isn't a big deal 🙈 maybe slightly more time spent on 'building', nothing else.

| awk '/=>/ { print $(NF-1) }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -r apt-mark manual \
| awk '/=>/ { print $(NF-1) }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -r apt-mark manual \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
&& npm cache clear --force

Expand Down
14 changes: 7 additions & 7 deletions .docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.22.8-buster-slim
FROM node:14.18.2-bullseye-slim

LABEL maintainer="[email protected]"

Expand All @@ -20,12 +20,12 @@ RUN aptMark="$(apt-mark showmanual)" \
&& apt-mark auto '.*' > /dev/null \
&& apt-mark manual $aptMark > /dev/null \
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { print $(NF-1) }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -r apt-mark manual \
| awk '/=>/ { print $(NF-1) }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -r apt-mark manual \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
&& npm cache clear --force

Expand Down
9 changes: 6 additions & 3 deletions .github/no-js-action-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"added": {
"ignore": []
}
"added": {
"ignore": [
"packages/accounts-linkedin/**/*",
"packages/linkedin-oauth/**/*"
]
}
}
16 changes: 8 additions & 8 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
echo "github.event_name: ${{ github.event_name }}"
cat $GITHUB_EVENT_PATH

- name: Use Node.js 12.22.8
- name: Use Node.js 14.18.2
uses: actions/setup-node@v2
with:
node-version: "12.22.8"
node-version: "14.18.2"

- uses: actions/checkout@v2

Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:

strategy:
matrix:
node-version: ["12.22.8"]
node-version: ["14.18.2"]
mongodb-version: ["3.6", "4.0", "4.2", "4.4","5.0"]

steps:
Expand Down Expand Up @@ -324,10 +324,10 @@ jobs:
path: ~/.meteor
key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release', '.github/workflows/build_and_test.yml') }}

- name: Use Node.js 12.22.8
- name: Use Node.js 14.18.2
uses: actions/setup-node@v2
with:
node-version: "12.22.8"
node-version: "14.18.2"

- name: Install Meteor
run: |
Expand Down Expand Up @@ -467,7 +467,7 @@ jobs:
aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive

curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
"{\"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\" }" \
"{\"nodeVersion\": \"14.18.2\", \"compatibleMongoVersions\": [\"3.6\", \"4.0\", \"4.2\", \"4.4\", \"5.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\"}" \
https://releases.rocket.chat/update

# Makes build fail if the release isn't there
Expand Down Expand Up @@ -570,10 +570,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 12.22.8
- name: Use Node.js 14.18.2
uses: actions/setup-node@v2
with:
node-version: "12.22.8"
node-version: "14.18.2"

- name: Login to DockerHub
uses: docker/login-action@v1
Expand Down
56 changes: 28 additions & 28 deletions .meteor/packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,36 @@
rocketchat:ddp
rocketchat:mongo-config

[email protected].2
accounts-github@1.4.3
accounts-google@1.3.3
accounts-meteor-developer@1.4.2
accounts-password@1.7.0
accounts-twitter@1.4.2
[email protected].3
accounts-github@1.5.0
accounts-google@1.4.0
accounts-meteor-developer@1.5.0
accounts-password@2.2.0
accounts-twitter@1.5.0
blaze-html-templates
[email protected]
ddp-rate-limiter@1.0.9
ddp-rate-limiter@1.1.0
[email protected]
dynamic-import@0.6.0
ecmascript@0.15.1
typescript@4.2.2
dynamic-import@0.7.2
ecmascript@0.16.1
typescript@4.4.1
[email protected]
email@2.0.0
http@1.4.2
logging@1.2.0
meteor-base@1.4.0
email@2.2.0
http@2.0.0
logging@1.3.1
meteor-base@1.5.1
[email protected]
mongo@1.11.0
mongo@1.13.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
service-configuration@1.0.11
service-configuration@1.3.0
[email protected]
[email protected]
spacebars
standard-minifier-js@2.6.0
standard-minifier-js@2.8.0
[email protected]

#rocketchat:google-natural-language
Expand All @@ -54,34 +54,34 @@ kadira:flow-router
mizzao:timesync
mrt:reactive-store
mystor:device-detection
nimble:restivus
rocketchat:restivus
nooitaf:colors
ostrio:cookies
pauli:accounts-linkedin
raix:handlebar-helpers
raix:ui-dropped-event

rocketchat:tap-i18n@1.10.1
rocketchat:tap-i18n@2.0.0
[email protected]
littledata:synced-cron

edgee:slingshot
jalik:[email protected]
accounts-base@1.9.0
accounts-oauth@1.2.0
autoupdate@1.7.0
babel-compiler@7.6.1
google-oauth@1.3.0
accounts-base@2.2.0
accounts-oauth@1.4.0
autoupdate@1.8.0
babel-compiler@7.8.0
google-oauth@1.4.1
htmljs
less
matb33:collection-hooks
meteorhacks:inject-initial
oauth@1.3.2
[email protected].0
[email protected].0
oauth@2.1.0
[email protected].1
[email protected].1
[email protected]
templating
webapp@1.10.1
webapp@1.13.0
[email protected]
rocketchat:oauth2-server
rocketchat:i18n
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@2.2
METEOR@2.5.3
Loading