Merge branch 'develop' into improve/otr-message

RocketChat · Feb 2, 2022 · ee421b6 · ee421b6
2 parents 6aed46e + 3a47726
commit ee421b6
Show file tree

Hide file tree

Showing 23 changed files with 1,821 additions and 75 deletions.
diff --git a/.docker/Dockerfile.alpine b/.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 \

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 4.4.0-develop
+ENV RC_VERSION 4.5.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.github/history-manual.json b/.github/history-manual.json
@@ -140,5 +140,12 @@
 			"pierre-lehnen-rc",
 			"gronke"
 		]
+	}],
+	"4.3.3": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"gronke"
+		]
 	}]
 }