Update Orion and MongoDB

Author: jason-fox

docker-compose/common.yml

@@ -17,7 +17,25 @@
 # see: https://github.com/FIWARE/helm-charts/
 #
 version: '3.9'
-services:  
+services:
+  # @context file is served from here
+  ld-context:
+    labels:
+      org.fiware: 'tutorial'
+    image: httpd:alpine
+    hostname: context
+    container_name: fiware-ld-context
+    ports:
+        - "3004:80"
+    volumes:
+        - data-models:/usr/local/apache2/htdocs/
+        - type: bind
+          source: ${PWD}/conf/mime.types
+          target: /usr/local/apache2/conf/mime.types
+          read_only: true
+    healthcheck:
+      test: (wget --server-response --spider --quiet  http://ld-context/ngsi-context.jsonld 2>&1 | awk 'NR==1{print $$2}'|  grep -q -e "200") || exit 1
+
   # Databases
   mongo-db:
     labels:
@@ -87,3 +105,9 @@ networks:
 
 volumes:
   mongo-db: ~
+  data-models:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: ${PWD}/data-models

docker-compose/orion-ld.yml

@@ -18,13 +18,13 @@
 #
 version: '3.9'
 services:
-  # Orion is the context broker
-  orion:
+  # Orion-LD is an NGSI-LD context broker
+  orion-ld:
     labels:
       org.fiware: 'tutorial'
     image: quay.io/fiware/orion-ld:${ORION_LD_VERSION}
     hostname: orion
-    container_name: fiware-orion
+    container_name: fiware-orion-ld
     depends_on:
       - mongo-db
     networks:

docker-compose/scorpio.yml

@@ -18,7 +18,7 @@
 #
 version: '3.9'
 services:
-  # Scorpio is the context broker
+  # Scorpio is an NGSI-LD context broker
   scorpio:
     labels:
       org.fiware: 'tutorial'

services

@@ -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 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 '
+	docker exec db-mongo mongo --eval '
 	conn = new Mongo();db.createCollection("orion-openiot");
 	db = conn.getDB("orion-openiot");
 	db.createCollection("entities");