Update scorpio.

Author: jason-fox

.env

@@ -1,13 +1,14 @@
 # Project name
 COMPOSE_PROJECT_NAME=fiware
+EXPOSED_PORT=1026
 
 # Orion LD variables
 ORION_LD_PORT=1026
 ORION_LD_VERSION=1.4.0
 
 # Scorpio variables
 SCORPIO_PORT=9090
-SCORPIO_VERSION=4.1.3
+SCORPIO_VERSION=4.1.8
 
 # Stellio variables
 STELLIO_DOCKER_TAG=2.5.2

docker-compose/scorpio-aaio.yml docker-compose/scorpio.ymldocker-compose/scorpio-aaio.yml renamed to docker-compose/scorpio.yml

@@ -16,44 +16,21 @@
 # 
 # see: https://github.com/FIWARE/helm-charts/
 #
-version: "3.8"
-
+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 the 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'
@@ -70,21 +47,8 @@ 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 connects to the Scorpio Broker
   tutorial:
     environment:
       - IOTA_DEFAULT_RESOURCE=/iot/d

import-data

@@ -29,23 +29,14 @@ curl -s -o /dev/null -X POST \
     "location": {"type": "GeoProperty", "value": {"type": "Point", "coordinates": [13.3986, 52.5547]}
     },
     "name": {"type": "Property", "value": "Bösebrücke Einkauf"},
-    "furniture":[
-        {
-            "type": "Relationship",
-            "datasetId": "urn:ngsi-ld:Relationship:1",
-            "object": "urn:ngsi-ld:Shelf:unit001"
-        },
-        {
-            "type": "Relationship",
-            "datasetId": "urn:ngsi-ld:Relationship:2",
-            "object": "urn:ngsi-ld:Shelf:unit002"
-        },
-        {
-            "type": "Relationship",
-            "datasetId": "urn:ngsi-ld:Relationship:3",
-            "object": "urn:ngsi-ld:Shelf:unit003"
-        }
-    ],
+    "furniture": {
+        "type": "Relationship",
+        "object": [
+          "urn:ngsi-ld:Shelf:unit001",
+          "urn:ngsi-ld:Shelf:unit002",
+          "urn:ngsi-ld:Shelf:unit003"
+        ]
+    },
     "@context": "'"${TUTORIAL_DATA_MODELS_CONTEXT}"'"
 }'
 
@@ -67,18 +58,13 @@ curl -s -o /dev/null -X POST \
     "location": {"type": "GeoProperty", "value": {"type": "Point", "coordinates": [13.3903,52.5075]}
     },
     "name": {"type": "Property", "value": "Checkpoint Markt"},
-    "furniture":[
-        {
-            "type": "Relationship",
-            "datasetId": "urn:ngsi-ld:Relationship:1",
-            "object": "urn:ngsi-ld:Shelf:unit004"
-        },
-        {
-            "type": "Relationship",
-            "datasetId": "urn:ngsi-ld:Relationship:2",
-            "object": "urn:ngsi-ld:Shelf:unit005"
-        }
-    ],
+    "furniture": {
+        "type": "Relationship",
+        "object": [
+          "urn:ngsi-ld:Shelf:unit004",
+          "urn:ngsi-ld:Shelf:unit005"
+        ]
+    },
     "@context": "'"${TUTORIAL_DATA_MODELS_CONTEXT}"'"
 }'
 
@@ -97,23 +83,14 @@ curl -s -o /dev/null -X POST \
     "location": {"type": "GeoProperty", "value": {"type": "Point", "coordinates": [13.4447,52.5031]}
     },
     "name": {"type": "Property", "value": "East Side Galleria"},
-    "furniture":[
-        {
-            "type": "Relationship",
-            "datasetId": "urn:ngsi-ld:Relationship:1",
-            "object": "urn:ngsi-ld:Shelf:unit006"
-        },
-        {
-            "type": "Relationship",
-            "datasetId": "urn:ngsi-ld:Relationship:2",
-            "object": "urn:ngsi-ld:Shelf:unit007"
-        },
-        {
-            "type": "Relationship",
-            "datasetId": "urn:ngsi-ld:Relationship:3",
-            "object": "urn:ngsi-ld:Shelf:unit008"
-        }
-    ],
+    "furniture": {
+        "type": "Relationship",
+        "object": [
+          "urn:ngsi-ld:Shelf:unit006",
+          "urn:ngsi-ld:Shelf:unit007",
+          "urn:ngsi-ld:Shelf:unit008"
+        ]
+    },
     "@context": "'"${TUTORIAL_DATA_MODELS_CONTEXT}"'"
 }'
 

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
 }
@@ -186,11 +186,11 @@ case "${command}" in
 		export $(cat .env | grep "#" -v)
 		stoppingContainers
 		waitForCoreContext
-		echo -e "Starting containers:  \033[1;34mScorpio\033[0m, \033[1mKafka\033[0m, \033[1mZookeeper\033[0m and a \033[1mPostgres\033[0m database, \033[1;36mIoT-Agent\033[0m, \033[1mTutorial\033[0m  and a \033[1mMongoDB\033[0m database."
+		echo -e "Starting containers:  \033[1;34mScorpio\033[0m and a \033[1mPostgres\033[0m database, \033[1;36mIoT-Agent\033[0m, \033[1mTutorial\033[0m  and a \033[1mMongoDB\033[0m database."
 		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."