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 33106b6 commit e27b8e5
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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
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 @@ -32,7 +32,7 @@ services:
- default
ports:
- ${EXPOSED_PORT:-1026}:${ORION_LD_PORT:-1026} # localhost:1026
command: -dbhost mongo-db -logLevel DEBUG -forwarding -experimental
command: -dbhost mongo-db -logLevel DEBUG -forwarding -mongocOnly
healthcheck:
test: curl --fail -s http://orion:${ORION_LD_PORT}/version || exit 1
interval: 5s
Expand Down
13 changes: 0 additions & 13 deletions services
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,6 @@ stoppingContainers () {
fi
}

addDatabaseIndex () {
printf "Create \033[1mMongoDB\033[0m database indexes ..."
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
echo -e " \033[1;32mdone\033[0m"
}

displayServices () {
echo ""
docker ps --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" --filter name="$1"
Expand All @@ -164,7 +152,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
waitForUserContext
echo -e "\033[1;34m${command}\033[0m is now running and exposed on localhost:${EXPOSED_PORT}"
Expand Down

0 comments on commit e27b8e5

Please sign in to comment.