Update to MongoDB 6.0

Author: jason-fox

.env

@@ -17,7 +17,7 @@ STELLIO_TIMESCALE_POSTGIS=16-2.16.0-3.3
 
 # MongoDB variables
 MONGO_DB_PORT=27017
-MONGO_DB_VERSION=4.4
+MONGO_DB_VERSION=6.0
 
 # Tutorial variables
 TUTORIAL_APP_PORT=3000

docker-compose/common.yml

@@ -48,13 +48,11 @@ services:
       - "${MONGO_DB_PORT}:${MONGO_DB_PORT}" # localhost:27017
     networks:
       - default
-    command: --nojournal
     volumes:
-      - mongo-db:/data
+      - mongo-db:/data/db
+      - mongo-config:/data/configdb
     healthcheck:
-      test: |
-        host=`hostname --ip-address || echo '127.0.0.1'`; 
-        mongo --quiet $host/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)' && echo 0 || echo 1
+      test: ["CMD","mongosh", "localhost:27017/test", "--quiet"]
       interval: 5s
 
 
@@ -91,6 +89,7 @@ networks:
 
 volumes:
   mongo-db: ~
+  mongo-config: ~
   data-models:
     driver: local
     driver_opts:

docker-compose/orion-ld.yml

@@ -21,6 +21,7 @@ services:
   orion-ld:
     labels:
       org.fiware: 'tutorial'
+    platform: linux/amd64
     image: quay.io/fiware/orion-ld:${ORION_LD_VERSION}
     hostname: orion
     container_name: fiware-orion-ld
@@ -29,8 +30,8 @@ services:
     networks:
       - default
     ports:
-      - "${EXPOSED_PORT}:${ORION_LD_PORT}" # localhost:1026
-    command: -dbhost mongo-db -logLevel DEBUG -experimental
+      - ${EXPOSED_PORT:-1026}:${ORION_LD_PORT:-1026} # localhost:1026
+    command: -dbhost mongo-db -logLevel DEBUG -forwarding -mongocOnly
     healthcheck:
       test: curl --fail -s http://orion:${ORION_LD_PORT}/version || exit 1
       interval: 5s

services

@@ -121,26 +121,6 @@ loadData () {
 		--entrypoint /bin/ash quay.io/curl/curl /import-data
 }
 
-addDatabaseIndex () {
-	printf "Adding appropriate \033[1mMongoDB\033[0m indexes for \033[1;34mOrion\033[0m  ..."
-	docker exec  db-mongo mongo --eval '
-	conn = new Mongo();db.createCollection("orion");
-	db = conn.getDB("orion");
-	db.createCollection("entities");
-	db.entities.createIndex({"_id.servicePath": 1, "_id.id": 1, "_id.type": 1}, {unique: true});
-	db.entities.createIndex({"_id.type": 1});
-	db.entities.createIndex({"_id.id": 1});' > /dev/null
-
-	docker exec  db-mongo mongo --eval '
-	conn = new Mongo();db.createCollection("orion-openiot");
-	db = conn.getDB("orion-openiot");
-	db.createCollection("entities");
-	db.entities.createIndex({"_id.servicePath": 1, "_id.id": 1, "_id.type": 1}, {unique: true});
-	db.entities.createIndex({"_id.type": 1});
-	db.entities.createIndex({"_id.id": 1});' > /dev/null
-	echo -e " \033[1;32mdone\033[0m"
-}
-
 stoppingContainers () {
 	CONTAINERS=$(docker ps -aq)
 	if [[ -n $CONTAINERS ]]; then 
@@ -176,7 +156,6 @@ case "${command}" in
 		echo ""
 		${dockerCmd} -f docker-compose/common.yml -f docker-compose/orion-ld.yml up -d --remove-orphans --renew-anon-volumes
 		waitForMongo
-		addDatabaseIndex
 		waitForOrionLD
 		export CONTEXT_BROKER=orion:1026
 		loadData