Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into mess…

…age-template-2

* 'develop' of github.com:RocketChat/Rocket.Chat:
  Chore: organize test files and fix code coverage (#24900)
  Chore: Missing keys in APIsDisplay (#24464)
  Bump ejson from 2.2.1 to 2.2.2 (#25057)
  Chore: Remove Alpine image deps after using them (#25053)
  Update pino and pino-pretty (#25052)
  [FIX] Upgrade Tab showing for a split second (#25050)
  [FIX] UserAutoComplete not rendering UserAvatar correctly (#25055)
  Chore: TS conversion folder client (#25031)
  Bump minimist from 1.2.5 to 1.2.6 in /ee/server/services (#24991)
  Bump template-file from 6.0.0 to 6.0.1 (#25002)
  Bump body-parser from 1.19.2 to 1.20.0 in /ee/server/services (#25042)
  Language update from LingoHub 🤖 (#25043)
  Bump version to 4.7.0-develop
  Bump version to 4.6.0
  Bump version to 4.6.0-rc.5
  Bump version to 4.6.0-rc.4
  Bump version to 4.6.0-rc.3
  Bump version to 4.6.0-rc.2
  Bump version to 4.6.0-rc.1
  Bump version to 4.6.0-rc.0

.docker/Dockerfile.alpine

@@ -1,12 +1,13 @@
 FROM node:14.18.3-alpine3.15
 
-RUN apk add --no-cache python3 make g++ libc6-compat ttf-dejavu
+RUN apk add --no-cache ttf-dejavu
 
 ADD . /app
 
 LABEL maintainer="buildmaster@rocket.chat"
 
 RUN set -x \
+    && apk add --no-cache --virtual .fetch-deps python3 make g++ libc6-compat \
     && cd /app/bundle/programs/server \
     && npm install --production \
     # Start hack for sharp...
@@ -16,7 +17,8 @@ RUN set -x \
     # End hack for sharp
     && cd npm \
     && npm rebuild bcrypt --build-from-source \
-    && npm cache clear --force
+    && npm cache clear --force \
+    && apk del .fetch-deps
 
 # 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.6.0-develop
+ENV RC_VERSION 4.7.0-develop
 
 MAINTAINER buildmaster@rocket.chat