From d0e019872f89e3da98a5afb8598bde8643c90491 Mon Sep 17 00:00:00 2001
From: Jason Fox <jason-fox@users.noreply.github.com>
Date: Mon, 29 Jan 2024 17:41:40 +0100
Subject: [PATCH] Update Orion and MongoDB

---
 .env               |  4 ++--
 docker-compose.yml | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index e0a5fbd..e2bd156 100644
--- a/.env
+++ b/.env
@@ -3,11 +3,11 @@ COMPOSE_PROJECT_NAME=fiware
 
 # Orion variables
 ORION_PORT=1026
-ORION_VERSION=3.10.1
+ORION_VERSION=3.11.0
 
 # MongoDB variables
 MONGO_DB_PORT=27017
-MONGO_DB_VERSION=4.4
+MONGO_DB_VERSION=6.0
 
 # Tutorial variables
 TUTORIAL_APP_PORT=3000
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b37cf1..442be28 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,8 +18,8 @@
 #
 version: "3.8"
 services:
-  # Orion is the context broker
-  orion:
+  # Orion is an NGSI-v2 context broker
+  orion-v2:
     labels:
       org.fiware: 'tutorial'
     image: quay.io/fiware/orion:${ORION_VERSION}
@@ -86,10 +86,11 @@ services:
     volumes:
       - mongo-db:/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", "--eval", "db.adminCommand('ping')"]
       interval: 5s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
     
 networks:
   default: