Update Stellio.

Author: jason-fox

docker-compose/stellio.yml

@@ -26,7 +26,7 @@ services:
     environment:
       - SPRING_PROFILES_ACTIVE=docker
     ports:
-      - "${STELLIO_PORT}:8080"
+      - "${EXPOSED_PORT}:${STELLIO_PORT}"
     networks:
       - default
 
@@ -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,15 +127,10 @@ services:
       retries: 20
       start_period: 10s
 
-     
-  # Tutorial acts as a series of dummy IoT Sensors over HTTP and connects to the Stellio 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://api-gateway:${STELLIO_PORT}/ngsi-ld/v1 # URL of the context broker to update context
+      - "CONTEXT_BROKER=http://stellio:${STELLIO_PORT}/ngsi-ld/v1" # URL of the context broker to update context
+
 networks:
   default:
     labels:

docker-compose/stellio/kafka/update_run.sh

@@ -180,13 +180,16 @@ 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"
 		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
 		displayServices stellio
 		waitForStellio
+		export CONTEXT_BROKER=stellio:8080
+		loadData
+		displayServices stellio
 		;;
 	"stop")
 		export $(cat .env | grep "#" -v)