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-aaio.yml docker-compose/scorpio.ymldocker-compose/scorpio-aaio.yml renamed to docker-compose/scorpio.yml

@@ -18,41 +18,19 @@
 #
 version: '3.9'
 services:
-  zookeeper:
-    labels:
-      org.fiware: 'tutorial'
-    image: zookeeper
-    hostname: zookeeper
-    container_name: zookeeper
-    networks:
-      - default
-    ports:
-      - "2181"
-    logging:
-      driver: none
-  kafka:
+  # Scorpio is an NGSI-LD context broker
+  scorpio:
     labels:
       org.fiware: 'tutorial'
-    image: bitnami/kafka
-    hostname: kafka
-    container_name: kafka
+    image: quay.io/fiware/scorpio:java-${SCORPIO_VERSION}
+    hostname: scorpio
+    container_name: fiware-scorpio
     networks:
       - default
     ports:
-      - "9092"
-    environment:
-      KAFKA_ADVERTISED_HOST_NAME: kafka
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_ADVERTISED_PORT: 9092
-      KAFKA_LOG_RETENTION_MS: 10000
-      KAFKA_LOG_RETENTION_CHECK_INTERVAL_MS: 5000
-      ALLOW_PLAINTEXT_LISTENER: "yes"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - "${EXPOSED_PORT}:${SCORPIO_PORT}"
     depends_on:
-      - zookeeper
-    logging:
-      driver: none
+      - postgres
   postgres:
     labels:
       org.fiware: 'tutorial'
@@ -69,29 +47,10 @@ services:
       POSTGRES_DB: ngb
     logging:
       driver: none
-  scorpio:
-    labels:
-      org.fiware: 'tutorial'
-    image: scorpiobroker/all-in-one-runner:java-kafka-${SCORPIO_VERSION}
-    hostname: scorpio
-    container_name: fiware-scorpio
-    networks:
-      - default
-    ports:
-      - "${SCORPIO_PORT}:9090"
-    depends_on:
-      - postgres
-      - kafka
 
-  # Tutorial acts as a series of dummy IoT Sensors over HTTP and connects to the Scorpio Broker
   tutorial:
     environment:
-      - IOTA_DEFAULT_RESOURCE=/iot/d
-      - DUMMY_DEVICES_PORT=${TUTORIAL_DUMMY_DEVICE_PORT} # Port used by the dummy IOT devices to receive commands
-      - DUMMY_DEVICES_TRANSPORT=HTTP # Default transport used by dummy Io devices
-      - DUMMY_DEVICES_PAYLOAD=ULTRALIGHT
-      - CONTEXT_BROKER=http://scorpio:${SCORPIO_PORT}/ngsi-ld/v1 # URL of the context broker to update context
-
+      - "CONTEXT_BROKER=http://scorpio:${SCORPIO_PORT}/ngsi-ld/v1" # URL of the context broker to update context
 
 networks:
   default:

services

@@ -58,7 +58,7 @@ waitForScorpio () {
 	while [ "${response}" -eq 000 ]
 	do
 		echo -e "Context Broker HTTP state: ${response} (waiting for 404)"
-		pause 60
+		pause 6
 		getHeartbeat "${SCORPIO}"
 	done
 }
@@ -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");
@@ -190,7 +190,7 @@ case "${command}" in
 		echo -e "- \033[1;34mScorpio\033[0m is the context broker"
 		echo -e "- Data models \033[1m@context\033[0m (Smart Supermarket) is supplied externally"
 		echo ""
-		${dockerCmd} -f docker-compose/common.yml -f docker-compose/scorpio-aaio.yml up -d --remove-orphans --renew-anon-volumes
+		${dockerCmd} -f docker-compose/common.yml -f docker-compose/scorpio.yml up -d --remove-orphans --renew-anon-volumes
 		waitForMongo
 		waitForScorpio
 		export CONTEXT_BROKER=scorpio:9090
@@ -224,7 +224,7 @@ case "${command}" in
 		export $(cat .env | grep "#" -v)
 		echo "Pulling Docker images"
 		docker pull -q quay.io/curl/curl
-		${dockerCmd} -f docker-compose/common.yml -f docker-compose/scorpio-aaio.yml -f docker-compose/orion-ld.yml -f docker-compose/stellio.yml pull
+		${dockerCmd} -f docker-compose/common.yml -f docker-compose/scorpio.yml -f docker-compose/orion-ld.yml -f docker-compose/stellio.yml pull
 		;;
 	*)
 		echo "Command not Found."