From 48ad73bb1f6cd8f52942a9876eb8746e692c3297 Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Mon, 29 Jan 2024 17:41:38 +0100 Subject: [PATCH] Update Orion and MongoDB --- .env | 4 ++-- docker-compose/mongodb.yml | 11 ++++++----- docker-compose/multiple.yml | 13 +++++++------ docker-compose/mysql.yml | 13 +++++++------ docker-compose/postgres.yml | 13 +++++++------ services | 16 ++-------------- 6 files changed, 31 insertions(+), 39 deletions(-) diff --git a/.env b/.env index bfc107e..05f1b5a 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/mongodb.yml b/docker-compose/mongodb.yml index 61c9f6a..38412c9 100755 --- a/docker-compose/mongodb.yml +++ b/docker-compose/mongodb.yml @@ -1,7 +1,7 @@ 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} @@ -122,10 +122,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: diff --git a/docker-compose/multiple.yml b/docker-compose/multiple.yml index 3a471c2..066d513 100755 --- a/docker-compose/multiple.yml +++ b/docker-compose/multiple.yml @@ -1,7 +1,7 @@ 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} @@ -79,7 +79,7 @@ services: hostname: iot-sensors container_name: fiware-tutorial depends_on: - - orion + - orion-v2 - iot-agent networks: default: @@ -124,10 +124,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 mysql-db: diff --git a/docker-compose/mysql.yml b/docker-compose/mysql.yml index 5f18954..ab3c3ca 100755 --- a/docker-compose/mysql.yml +++ b/docker-compose/mysql.yml @@ -1,7 +1,7 @@ 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} @@ -79,7 +79,7 @@ services: hostname: iot-sensors container_name: fiware-tutorial depends_on: - - orion + - orion-v2 - iot-agent networks: default: @@ -124,10 +124,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 mysql-db: diff --git a/docker-compose/postgres.yml b/docker-compose/postgres.yml index 9dd36df..9073e18 100755 --- a/docker-compose/postgres.yml +++ b/docker-compose/postgres.yml @@ -1,7 +1,7 @@ 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} @@ -79,7 +79,7 @@ services: hostname: iot-sensors container_name: fiware-tutorial depends_on: - - orion + - orion-v2 - iot-agent networks: default: @@ -125,10 +125,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 postgres-db: diff --git a/services b/services index 978a80e..dbb2b0c 100755 --- a/services +++ b/services @@ -92,7 +92,7 @@ displayServices () { addDatabaseIndex () { printf "Adding appropriate \033[1mMongoDB\033[0m indexes for \033[1;34mOrion\033[0m ..." - docker exec db-mongo mongo --eval ' + docker exec db-mongo mongosh --eval ' conn = new Mongo();db.createCollection("orion"); db = conn.getDB("orion"); db.createCollection("entities"); @@ -100,7 +100,7 @@ addDatabaseIndex () { db.entities.createIndex({"_id.type": 1}); db.entities.createIndex({"_id.id": 1});' > /dev/null - docker exec db-mongo mongo --eval ' + docker exec db-mongo mongosh --eval ' conn = new Mongo();db.createCollection("orion-openiot"); db = conn.getDB("orion-openiot"); db.createCollection("entities"); @@ -109,18 +109,6 @@ addDatabaseIndex () { db.entities.createIndex({"_id.id": 1});' > /dev/null echo -e " \033[1;32mdone\033[0m" - printf "Adding appropriate \033[1mMongoDB\033[0m indexes for \033[1;36mIoT-Agent\033[0m ..." - docker exec db-mongo mongo --eval ' - conn = new Mongo(); - db = conn.getDB("iotagentul"); - db.createCollection("devices"); - db.devices.createIndex({"_id.service": 1, "_id.id": 1, "_id.type": 1}); - db.devices.createIndex({"_id.type": 1}); - db.devices.createIndex({"_id.id": 1}); - db.createCollection("groups"); - db.groups.createIndex({"_id.resource": 1, "_id.apikey": 1, "_id.service": 1}); - db.groups.createIndex({"_id.type": 1});' > /dev/null - echo -e " \033[1;32mdone\033[0m" }