Update to MongoDB 6.0

FIWARE · Aug 30, 2024 · e00767a · e00767a
1 parent d89a0df
commit e00767a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 26 deletions.
diff --git a/.env b/.env
@@ -24,7 +24,7 @@ CURL_VERSION=8.4.0
 
 # MongoDB variables
 MONGO_DB_PORT=27017
-MONGO_DB_VERSION=4.4
+MONGO_DB_VERSION=6.0
 
 # IoT Agent Ultralight Variables
 ULTRALIGHT_VERSION=3.4.0-distroless

diff --git a/docker-compose/common.yml b/docker-compose/common.yml
@@ -51,9 +51,7 @@ services:
     volumes:
       - mongo-db1:/data
     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
 
 

diff --git a/docker-compose/orion-ld.yml b/docker-compose/orion-ld.yml
@@ -31,7 +31,7 @@ services:
       - default
     ports:
       - ${EXPOSED_PORT:-1026}:${ORION_LD_PORT:-1026}
-    command: -dbhost mongo-db -logLevel INFO -forwarding -experimental -wip entityMaps
+    command: -dbhost mongo-db -logLevel INFO -forwarding -mongocOnly -wip entityMaps
     healthcheck:
       test: curl --fail -s http://orion:${ORION_LD_PORT}/version || exit 1
       interval: 30s

diff --git a/services b/services
@@ -124,26 +124,6 @@ loadData () {
 
 }
 
-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 
@@ -180,7 +160,6 @@ case "${command}" in
 		${dockerCmd} -f docker-compose/common.yml -f docker-compose/orion-ld.yml up -d --remove-orphans --renew-anon-volumes
 		displayServices "orion|fiware"
 		waitForMongo
-		addDatabaseIndex
 		waitForOrionLD
 		export CONTEXT_BROKER=orion:1026
 		loadData