Update Stellio.

Author: jason-fox

.env

@@ -4,7 +4,7 @@ EXPOSED_PORT=1026
 
 # Orion LD variables
 ORION_LD_PORT=1026
-ORION_LD_VERSION=1.7.1
+ORION_LD_VERSION=1.8.0
 
 # Scorpio variables
 SCORPIO_PORT=9090

FIWARE Working with Linked Data.postman_collection.json

@@ -359,7 +359,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n    \"id\": \"urn:ngsi-ld:Building:store005\",\n    \"type\": \"ビル\",\n    \"カテゴリー\": {\n    \t\"type\": \"VocabularyProperty\",\n        \"vocab\": [\"コマーシャル\"]\n    },\n    \"住所\": {\n        \"type\": \"Property\",\n        \"value\": {\n            \"streetAddress\": \"Eisenacher Straße 98\",\n            \"addressRegion\": \"Berlin\",\n            \"addressLocality\": \"Marzahn\",\n            \"postalCode\": \"12685\"\n        }\n    },\n    \"場所\": {\n        \"type\": \"GeoProperty\",\n        \"value\": {\n             \"type\": \"Point\",\n             \"coordinates\": [13.5646, 52.5435]\n        }\n    },\n    \"名前\": {\n        \"type\": \"Property\",\n        \"value\": \"Yuusui-en\"\n    },\n    \"@context\":\"http://context/japanese-user-context.jsonld\"\n}"
+							"raw": "{\n    \"id\": \"urn:ngsi-ld:Building:store005\",\n    \"type\": \"ビル\",\n    \"カテゴリー\": {\n    \t\"type\": \"VocabProperty\",\n        \"vocab\": [\"コマーシャル\"]\n    },\n    \"住所\": {\n        \"type\": \"Property\",\n        \"value\": {\n            \"streetAddress\": \"Eisenacher Straße 98\",\n            \"addressRegion\": \"Berlin\",\n            \"addressLocality\": \"Marzahn\",\n            \"postalCode\": \"12685\"\n        }\n    },\n    \"場所\": {\n        \"type\": \"GeoProperty\",\n        \"value\": {\n             \"type\": \"Point\",\n             \"coordinates\": [13.5646, 52.5435]\n        }\n    },\n    \"名前\": {\n        \"type\": \"Property\",\n        \"value\": \"Yuusui-en\"\n    },\n    \"@context\":\"http://context/japanese-user-context.jsonld\"\n}"
 						},
 						"url": {
 							"raw": "http://{{orion}}/ngsi-ld/v1/entities/",

docker-compose/stellio.yml

@@ -79,7 +79,7 @@ services:
   kafka:
     labels:
       org.fiware: 'tutorial'
-    image: confluentinc/cp-kafka:7.3.1
+    image: confluentinc/cp-kafka:7.6.0
     container_name: kafka
     ports:
       - 29092:29092
@@ -98,9 +98,7 @@ services:
       KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
       KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
       KAFKA_LOG4J_ROOT_LOGLEVEL: INFO
-    volumes:
-      - ./stellio/kafka/update_run.sh:/tmp/update_run.sh
-    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
+      CLUSTER_ID: NjExODZhMWVjMzllMTFlZm
 
 
   # Databases
@@ -129,6 +127,10 @@ services:
       retries: 20
       start_period: 10s
 
+  tutorial:
+    environment:
+      - "CONTEXT_BROKER=http://stellio:${STELLIO_PORT}/ngsi-ld/v1" # URL of the context broker to update context
+
 
 networks:
   default:

docker-compose/stellio/kafka/update_run.sh

@@ -20,7 +20,7 @@ curl -s -o /dev/null -X POST \
   -d '{
     "id": "urn:ngsi-ld:Building:store001",
     "type": "Building",
-    "category": {"type": "VocabularyProperty", "vocab": "commercial"},
+    "category": {"type": "VocabProperty", "vocab": "commercial"},
     "address": {
       "type": "Property", 
       "value": {"streetAddress": "Bornholmer Straße 65", "addressRegion": "Berlin", "addressLocality": "Prenzlauer Berg", "postalCode": "10439"},
@@ -49,7 +49,7 @@ curl -s -o /dev/null -X POST \
   -d '{
     "id": "urn:ngsi-ld:Building:store002",
     "type": "Building",
-    "category": {"type": "VocabularyProperty", "vocab": ["commercial"]},
+    "category": {"type": "VocabProperty", "vocab": ["commercial"]},
     "address": {
       "type": "Property", 
       "value": {"streetAddress":"Friedrichstraße 44", "addressRegion":"Berlin", "addressLocality":"Kreuzberg", "postalCode":"10969"},
@@ -74,7 +74,7 @@ curl -s -o /dev/null -X POST \
   -d '{
     "id": "urn:ngsi-ld:Building:store003",
     "type": "Building",
-    "category": {"type": "VocabularyProperty", "vocab": ["commercial"]},
+    "category": {"type": "VocabProperty", "vocab": ["commercial"]},
     "address": {
       "type": "Property", 
       "value": {"streetAddress":"Mühlenstrasse 10", "addressRegion":"Berlin", "addressLocality":"Friedrichshain", "postalCode":"10243"},
@@ -101,7 +101,7 @@ curl -s -o /dev/null -X POST \
   -d '{
     "id": "urn:ngsi-ld:Building:store004",
     "type": "Building",
-    "category": {"type": "VocabularyProperty", "vocab": ["commercial"]},
+    "category": {"type": "VocabProperty", "vocab": ["commercial"]},
     "address": {
       "type": "Property", 
       "value": {"streetAddress":"Panoramastraße 1A", "addressRegion":"Berlin", "addressLocality":"Mitte", "postalCode":"10178"},

import-data

@@ -180,14 +180,14 @@ case "${command}" in
 		export $(cat .env | grep "#" -v)
 		stoppingContainers
 		waitForCoreContext
-		echo -e "Starting containers:  \033[1;34mStellio\033[0m, \033[1mKafka\033[0m, \033[1mZookeeper\033[0m, \033[1mNeo4j\033[0m, \033[1mPostgreSQL/TimescaleDB\033[0m, and a linked data \033[1mContext\033[0m."
+		echo -e "Starting containers:  \033[1;34mStellio\033[0m, \033[1mKafka\033[0m, \033[1mPostgreSQL/TimescaleDB\033[0m, and a linked data \033[1mContext\033[0m."
 		echo -e "- \033[1;34mStellio\033[0m is the context broker\n"
 		echo -e "- Data models \033[1m@context\033[0m (Smart Supermarket) is supplied externally"
 		echo ""
 		${dockerCmd}  -f docker-compose/common.yml -f docker-compose/stellio.yml up -d --remove-orphans --renew-anon-volumes
 		waitForMongo
 		waitForStellio
-		export CONTEXT_BROKER=api-gateway:8080
+		export CONTEXT_BROKER=stellio:8080
 		loadData
 		displayServices stellio
 		;;