Skip to content

Commit

Permalink
Update to MongoDB 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-fox committed Aug 30, 2024
1 parent 4bdd44a commit 8f63f82
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ CURL_VERSION=8.4.0

# MongoDB variables
MONGO_DB_PORT=27017
MONGO_DB_VERSION=4.4
MONGO_DB_VERSION=6.0

# Tutorial variables
TUTORIAL_APP_PORT=3000
Expand Down
4 changes: 1 addition & 3 deletions docker-compose/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ services:
- 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

# Tutorial acts as a series of dummy IoT Sensors over HTTP
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/orion-ld.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
- default
ports:
- ${EXPOSED_PORT:-1026}:${ORION_LD_PORT:-1026}
command: -dbhost mongo-db -logLevel DEBUG -forwarding
command: -dbhost mongo-db -logLevel DEBUG -forwarding -mongocOnly
healthcheck:
test: curl --fail -s http://orion:${ORION_LD_PORT:-1026}/version || exit 1
interval: 5s
Expand Down
5 changes: 2 additions & 3 deletions services
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ loadData () {

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");
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 '
docker exec db-mongo mongosh --eval '
conn = new Mongo();db.createCollection("orion-openiot");
db = conn.getDB("orion-openiot");
db.createCollection("entities");
Expand Down Expand Up @@ -181,7 +181,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
waitForOrion
export CONTEXT_BROKER=orion:1026
loadData
Expand Down

0 comments on commit 8f63f82

Please sign in to comment.