-
Notifications
You must be signed in to change notification settings - Fork 11.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat!: Meteor 3.0 - Node.js 20 (#31438)
Co-authored-by: Douglas Gubert <[email protected]>
- Loading branch information
1 parent
a178a8d
commit 425a6a4
Showing
75 changed files
with
431 additions
and
752 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,14 @@ | ||
--- | ||
"@rocket.chat/meteor": major | ||
"rocketchat-services": major | ||
--- | ||
|
||
Upgrades the version of the Meteor framework to 3.0 | ||
|
||
The main reason behind this is the upgrade of the Node.js version, where version 14 will be removed and version 20 will be used instead. | ||
|
||
Internally, significant changes have been made, mostly due to the removal of fibers. | ||
|
||
As a result, it was necessary to adapt our code to work with the new version. | ||
|
||
No functionality should have been affected by this, but if you are running Rocket.Chat in unconventional ways, please note that you need to upgrade your Node.js version. |
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,6 @@ | ||
--- | ||
"@rocket.chat/meteor": major | ||
"rocketchat-services": major | ||
--- | ||
|
||
Node.js 20.x support |
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,5 @@ | ||
--- | ||
"@rocket.chat/meteor": major | ||
--- | ||
|
||
Remove linkedin oauth package, now linkedin oauth must to me configured as custom oauth |
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
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
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 node:14.21.3-bullseye-slim | ||
FROM node:20.15.1-bullseye-slim | ||
|
||
LABEL 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 |
---|---|---|
|
@@ -2,7 +2,7 @@ ARG DENO_VERSION="1.37.1" | |
|
||
FROM denoland/deno:bin-${DENO_VERSION} as deno | ||
|
||
FROM node:14.21.3-bullseye-slim | ||
FROM node:20.15.1-bullseye-slim | ||
|
||
LABEL 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,62 +1,10 @@ | ||
ARG DENO_VERSION="1.37.1" | ||
|
||
FROM denoland/deno:bin-${DENO_VERSION} as deno | ||
|
||
FROM node:14.21.3-alpine3.16 | ||
FROM node:20.15.1-alpine3.20 | ||
|
||
LABEL maintainer="[email protected]" | ||
|
||
ENV LANG=C.UTF-8 | ||
|
||
## Alpine 3.16 does not have a deno package, but newer versions have it | ||
## So as soon as we can update the Alpine version, we can replace the following | ||
## GLIBC installation part by an `apk add deno` | ||
|
||
# Installing glibc deps required by Deno | ||
# This replaces libc6-compat | ||
# Copied from https://github.com/Docker-Hub-frolvlad/docker-alpine-glibc, which denoland/deno:alpine-1.37.1 uses | ||
# NOTE: Glibc 2.35 package is broken: https://github.com/sgerrand/alpine-pkg-glibc/issues/176, so we stick to 2.34 for now | ||
RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" && \ | ||
ALPINE_GLIBC_PACKAGE_VERSION="2.34-r0" && \ | ||
ALPINE_GLIBC_BASE_PACKAGE_FILENAME="glibc-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \ | ||
ALPINE_GLIBC_BIN_PACKAGE_FILENAME="glibc-bin-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \ | ||
ALPINE_GLIBC_I18N_PACKAGE_FILENAME="glibc-i18n-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \ | ||
apk add --no-cache --virtual=.build-dependencies wget ca-certificates ttf-dejavu && \ | ||
echo \ | ||
"-----BEGIN PUBLIC KEY-----\ | ||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApZ2u1KJKUu/fW4A25y9m\ | ||
y70AGEa/J3Wi5ibNVGNn1gT1r0VfgeWd0pUybS4UmcHdiNzxJPgoWQhV2SSW1JYu\ | ||
tOqKZF5QSN6X937PTUpNBjUvLtTQ1ve1fp39uf/lEXPpFpOPL88LKnDBgbh7wkCp\ | ||
m2KzLVGChf83MS0ShL6G9EQIAUxLm99VpgRjwqTQ/KfzGtpke1wqws4au0Ab4qPY\ | ||
KXvMLSPLUp7cfulWvhmZSegr5AdhNw5KNizPqCJT8ZrGvgHypXyiFvvAH5YRtSsc\ | ||
Zvo9GI2e2MaZyo9/lvb+LbLEJZKEQckqRj4P26gmASrZEPStwc+yqy1ShHLA0j6m\ | ||
1QIDAQAB\ | ||
-----END PUBLIC KEY-----" | sed 's/ */\n/g' > "/etc/apk/keys/sgerrand.rsa.pub" && \ | ||
wget \ | ||
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \ | ||
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \ | ||
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \ | ||
mv /etc/nsswitch.conf /etc/nsswitch.conf.bak && \ | ||
apk add --no-cache --force-overwrite \ | ||
"$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \ | ||
"$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \ | ||
"$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \ | ||
\ | ||
mv /etc/nsswitch.conf.bak /etc/nsswitch.conf && \ | ||
rm "/etc/apk/keys/sgerrand.rsa.pub" && \ | ||
(/usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true) && \ | ||
echo "export LANG=$LANG" > /etc/profile.d/locale.sh && \ | ||
\ | ||
apk del glibc-i18n && \ | ||
\ | ||
rm "/root/.wget-hsts" && \ | ||
apk del .build-dependencies && \ | ||
rm \ | ||
"$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \ | ||
"$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \ | ||
"$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" | ||
|
||
COPY --from=deno /deno /bin/deno | ||
RUN apk add --no-cache deno ttf-dejavu | ||
|
||
ADD . /app | ||
|
||
|
@@ -70,19 +18,19 @@ ENV DEPLOY_METHOD=docker \ | |
Accounts_AvatarStorePath=/app/uploads | ||
|
||
RUN set -x \ | ||
&& apk add --no-cache --virtual .fetch-deps python3 make g++ \ | ||
&& apk add --no-cache --virtual .fetch-deps python3 make g++ py3-setuptools libc6-compat \ | ||
&& cd /app/bundle/programs/server \ | ||
&& npm install --omit=dev --unsafe-perm \ | ||
# Start hack for sharp... | ||
&& rm -rf npm/node_modules/sharp \ | ||
&& npm install [email protected] \ | ||
&& mv node_modules/sharp npm/node_modules/sharp \ | ||
# End hack for sharp | ||
# Start hack for isolated-vm... | ||
&& rm -rf npm/node_modules/isolated-vm \ | ||
&& npm install isolated-vm@4.4.2 \ | ||
&& mv node_modules/isolated-vm npm/node_modules/isolated-vm \ | ||
# End hack for isolated-vm | ||
# # Start hack for isolated-vm... | ||
# && rm -rf npm/node_modules/isolated-vm \ | ||
# && npm install isolated-vm@4.6.0 \ | ||
# && mv node_modules/isolated-vm npm/node_modules/isolated-vm \ | ||
# # End hack for isolated-vm | ||
&& cd /app/bundle/programs/server/npm \ | ||
&& npm rebuild bcrypt --build-from-source \ | ||
&& npm cache clear --force \ | ||
|
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 +1 @@ | ||
METEOR@2.16 | ||
METEOR@3.0.3 |
Oops, something went wrong.