[Upstream Catchup] Merge RC:master to develop_pwa

.docker-mongo/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.18.2-bullseye-slim
+FROM node:14.18.3-bullseye-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 

.docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.18.2-bullseye-slim
+FROM node:14.18.3-bullseye-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 

.docker/Dockerfile.alpine

@@ -4,19 +4,19 @@ RUN apk add --no-cache python3 make g++ libc6-compat ttf-dejavu
 
 ADD . /app
 
-MAINTAINER buildmaster@rocket.chat
+LABEL maintainer="buildmaster@rocket.chat"
 
 RUN set -x \
- && cd /app/bundle/programs/server \
- && npm install --production \
- # Start hack for sharp...
- && rm -rf npm/node_modules/sharp \
- && npm install sharp@0.29.3 \
- && mv node_modules/sharp npm/node_modules/sharp \
- # End hack for sharp
- && cd npm \
- && npm rebuild bcrypt --build-from-source \
- && npm cache clear --force
+    && cd /app/bundle/programs/server \
+    && npm install --production \
+    # Start hack for sharp...
+    && rm -rf npm/node_modules/sharp \
+    && npm install sharp@0.29.3 \
+    && mv node_modules/sharp npm/node_modules/sharp \
+    # End hack for sharp
+    && cd npm \
+    && npm rebuild bcrypt --build-from-source \
+    && npm cache clear --force
 
 # needs a mongo instance - defaults to container linking with alias 'mongo'
 ENV DEPLOY_METHOD=docker \

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 4.4.2
+ENV RC_VERSION 4.6.3
 
 MAINTAINER buildmaster@rocket.chat