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

…6643-Pranav2612000-develop

* 'develop' of github.com:RocketChat/Rocket.Chat: (71 commits)
  Fix omnichannel icon missing on sidebar (RocketChat#16775)
  [IMPROVE] Rename client-side term "Livechat" to "Omnichannel" (RocketChat#16752)
  [FIX] Language country has been ignored on translation load (RocketChat#16757)
  [FIX] Cannot edit Profile when Full Name is empty and not required (RocketChat#16744)
  [IMPROVE] Accept open formarts of text, spreadsheet, presentation for upload by default (RocketChat#16502)
  Removing Trailing Space (RocketChat#16470)
  Lazy load categories and marketplaceVersion (RocketChat#16258)
  Fix Docker preview image (RocketChat#16736)
  [FIX] Manual Register use correct state for determining registered (RocketChat#16726)
  [FIX] Rocket.Chat takes too long to set the username when it fails to send enrollment email (RocketChat#16723)
  [CHORE] Changed remaining SelectInput's to Select (RocketChat#16719)
  [CHORE] Update snap install instructions (RocketChat#16720)
  [FIX] TypeError when trying to load avatar of an invalid room. (RocketChat#16699)
  [FIX] Color setting editing issues (RocketChat#16706)
  [FIX] Console error on login (RocketChat#16704)
  [NEW] Add methods to include room types on dashboard (RocketChat#16576)
  [FIX] ie11 support (RocketChat#16682)
  Regression: Show upload errors (RocketChat#16681)
  [FIX] Delete messages while searching bug (RocketChat#16568)
  Use insertSync
  ...

.docker-mongo/Dockerfile

@@ -1,24 +1,24 @@
 FROM rocketchat/base:12.14.0
 
-ADD . /app
-ADD entrypoint.sh /app/bundle/
-
-MAINTAINER buildmaster@rocket.chat
+LABEL maintainer="buildmaster@rocket.chat"
 
 RUN set -x \
- && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
+ && apt-get update \
+ && apt-get install -y wget \
+ && wget -qO - https://www.mongodb.org/static/pgp/server-4.0.asc | apt-key add - \
  && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list \
  && apt-get update \
- && apt-get install -y --force-yes pwgen mongodb-org \
- && echo "mongodb-org hold" | dpkg --set-selections \
- && echo "mongodb-org-server hold" | dpkg --set-selections \
- && echo "mongodb-org-shell hold" | dpkg --set-selections \
- && echo "mongodb-org-mongos hold" | dpkg --set-selections \
- && echo "mongodb-org-tools hold" | dpkg --set-selections \
+ && apt-get install -y pwgen mongodb-org \
+ && apt-get clean my room
+
+ADD . /app
+ADD entrypoint.sh /app/bundle/
+
+RUN set -x \
  && cd /app/bundle/programs/server \
  && npm install \
  && npm cache clear --force \
- && rm -rf /var/lib/apt/lists/*
+ && chown -R rocketchat:rocketchat /app
 
 VOLUME /app/uploads
 
@@ -28,6 +28,7 @@ WORKDIR /app/bundle
 ENV DEPLOY_METHOD=docker-preview \
     NODE_ENV=production \
     MONGO_URL=mongodb://localhost:27017/rocketchat \
+    MONGO_OPLOG_URL=mongodb://localhost:27017/local \
     HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \

.docker-mongo/entrypoint.sh

@@ -39,11 +39,32 @@ echo """
 ╚═╝  ╚═╝ ╚═════╝  ╚═════╝╚═╝  ╚═╝╚══════╝   ╚═╝╚═╝ ╚═════╝╚═╝  ╚═╝╚═╝  ╚═╝   ╚═╝       ╚═╝     ╚═╝  ╚═╝╚══════╝  ╚═══╝  ╚═╝╚══════╝ ╚══╝╚══╝
 """
 
-mongod --smallfiles --storageEngine=mmapv1 --fork --config /etc/mongod.conf
+mongod --smallfiles --storageEngine=mmapv1 --fork --replSet rs0 --config /etc/mongod.conf
 
 until mongo --eval "db" &> /dev/null; do
 	echo "MongoDB still not ready, sleeping"
 	sleep 1
 done
 
-node main.js
+sleep 2
+
+# initiate mongo replica set
+for i in `seq 1 30`; do
+	mongo rocketchat --eval "
+	rs.initiate({
+		_id: 'rs0',
+		members: [ { _id: 0, host: 'localhost:27017' } ]})" &&
+	s=$? && break || s=$?;
+	echo "Tried $i times. Waiting 5 secs...";
+	sleep 5;
+done;
+
+sleep 2
+
+# try multiple times until replica set is ready
+for i in `seq 1 30`; do
+	node main.js &&
+	s=$? && break || s=$?;
+	echo "Tried $i times. Waiting 5 secs...";
+	sleep 5;
+done;

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.0-develop
+ENV RC_VERSION 3.1.0-develop
 
 MAINTAINER buildmaster@rocket.chat