Merge pull request #17763 from antobinary/22.04-attempt-3

build: tweaks to run with MongoDB 6; Meteor upgrade to 2.11

bigbluebutton-html5/.meteor/packages

@@ -5,22 +5,22 @@
 
 meteor-base@1.5.1
 mobile-experience@1.1.0
-mongo@1.16.4
+mongo@1.16.5
 reactive-var@1.0.12
 
-standard-minifier-css@1.8.3
+standard-minifier-css@1.9.0
 standard-minifier-js@2.8.1
 es5-shim@4.8.0
-ecmascript@0.16.5
+ecmascript@0.16.6
 shell-server@0.5.0
 
 static-html@1.3.2
 react-meteor-data
 session@1.2.1
-tracker@1.3.0
+tracker@1.3.1
 check@1.3.2
 
 rocketchat:streamer
 meteortesting:mocha
 lmieulet:meteor-coverage
-typescript
+typescript@4.9.4

bigbluebutton-html5/.meteor/release

@@ -1 +1 @@
-METEOR@2.10.0
+METEOR@2.11.0

bigbluebutton-html5/.meteor/versions

@@ -1,6 +1,6 @@
 allow-deny@1.1.1
 autoupdate@1.8.0
-babel-compiler@7.10.2
+babel-compiler@7.10.3
 babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
@@ -16,7 +16,7 @@ ddp-common@1.4.0
 ddp-server@2.6.0
 diff-sequence@1.1.2
 dynamic-import@0.7.2
-ecmascript@0.16.5
+ecmascript@0.16.6
 ecmascript-runtime@0.8.0
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
@@ -32,29 +32,29 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 launch-screen@1.3.0
 lmieulet:meteor-coverage@4.1.0
-logging@1.3.1
-meteor@1.11.0
+logging@1.3.2
+meteor@1.11.1
 meteor-base@1.5.1
 meteortesting:browser-tests@1.3.5
 meteortesting:mocha@2.0.3
 meteortesting:mocha-core@8.1.2
 minifier-css@1.6.2
 minifier-js@2.7.5
-minimongo@1.9.1
+minimongo@1.9.2
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
 modern-browsers@0.1.9
 modules@0.19.0
 modules-runtime@0.13.1
-mongo@1.16.4
+mongo@1.16.5
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
-npm-mongo@4.12.1
+npm-mongo@4.14.0
 ordered-dict@1.1.0
 promise@0.12.2
 random@1.2.1
-react-fast-refresh@0.2.5
+react-fast-refresh@0.2.6
 react-meteor-data@2.5.1
 reactive-dict@1.3.1
 reactive-var@1.0.12
@@ -66,13 +66,13 @@ session@1.2.1
 shell-server@0.5.0
 socket-stream-client@0.5.0
 spacebars-compiler@1.3.1
-standard-minifier-css@1.8.3
+standard-minifier-css@1.9.0
 standard-minifier-js@2.8.1
 static-html@1.3.2
 templating-tools@1.2.2
-tracker@1.3.0
-typescript@4.7.4
-underscore@1.0.11
+tracker@1.3.1
+typescript@4.9.4
+underscore@1.0.12
 url@1.3.2
-webapp@1.13.3
+webapp@1.13.4
 webapp-hashing@1.1.1

build/packages-template/bbb-html5/build.sh

@@ -91,7 +91,7 @@ cp bbb-html5-with-roles.conf staging/usr/share/meteor/bundle
 cp mongod_start_pre.sh staging/usr/share/meteor/bundle
 chmod +x staging/usr/share/meteor/bundle/mongod_start_pre.sh
 
-cp mongo-ramdisk.conf staging/usr/share/meteor/bundle
+cp mongo-ramdisk.conf staging/etc/mongod.conf
 
 mkdir -p staging/usr/lib/systemd/system
 cp bbb-html5.service staging/usr/lib/systemd/system

build/packages-template/bbb-html5/systemd_start.sh

@@ -16,13 +16,13 @@ done;
 echo "Mongo started";
 
 echo "Initializing replicaset"
-mongo 127.0.1.1 --eval 'rs.initiate({ _id: "rs0", members: [ {_id: 0, host: "127.0.1.1"} ]})'
+mongosh 127.0.1.1 --eval 'rs.initiate({ _id: "rs0", members: [ {_id: 0, host: "127.0.1.1"} ]})'
 
 
 echo "Waiting to become a master"
 IS_MASTER="XX"
 while [ "$IS_MASTER" \!= "true" ]; do
-    IS_MASTER=$(mongo mongodb://127.0.1.1:27017/ --eval  'db.isMaster().ismaster' | tail -n 1)
+    IS_MASTER=$(mongosh mongodb://127.0.1.1:27017/ --eval  'db.isMaster().ismaster' | tail -n 1)
     sleep 0.5;
 done;
 

build/packages-template/bbb-html5/systemd_start_frontend.sh

@@ -16,13 +16,13 @@ done;
 echo "Mongo started";
 
 echo "Initializing replicaset"
-mongo 127.0.1.1 --eval 'rs.initiate({ _id: "rs0", members: [ {_id: 0, host: "127.0.1.1"} ]})'
+mongosh 127.0.1.1 --eval 'rs.initiate({ _id: "rs0", members: [ {_id: 0, host: "127.0.1.1"} ]})'
 
 
 echo "Waiting to become a master"
 IS_MASTER="XX"
 while [ "$IS_MASTER" \!= "true" ]; do
-    IS_MASTER=$(mongo mongodb://127.0.1.1:27017/ --eval  'db.isMaster().ismaster' | tail -n 1)
+    IS_MASTER=$(mongosh mongodb://127.0.1.1:27017/ --eval  'db.isMaster().ismaster' | tail -n 1)
     sleep 0.5;
 done;