Updating Scorpio and Stellio

Author: jason-fox

.env

@@ -7,7 +7,7 @@ ORION_LD_VERSION=0.8.2
 
 # Scorpio variables
 SCORPIO_PORT=9090
-SCORPIO_VERSION=1.1.0
+SCORPIO_VERSION=2.1.13
 
 # Stellio variables
 STELLIO_DOCKER_TAG=v1.7.2

docker-compose/common.yml

@@ -16,7 +16,7 @@
 # 
 # see: https://github.com/FIWARE/helm-charts/
 #
-version: "3.8"
+version: '3.9'
 services:  
   # Databases
   mongo-db:

docker-compose/orion-ld.yml

@@ -16,7 +16,7 @@
 # 
 # see: https://github.com/FIWARE/helm-charts/
 #
-version: "3.8"
+version: '3.9'
 services:
   # Orion is the context broker
   orion:

docker-compose/scorpio-aaio.yml

@@ -16,19 +16,24 @@
 # 
 # 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:
-    image: wurstmeister/kafka
+    labels:
+      org.fiware: 'tutorial'
+    image: bitnami/kafka
     hostname: kafka
     container_name: kafka
     networks:
@@ -39,13 +44,19 @@ services:
       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
     depends_on:
       - zookeeper
-      
+    logging:
+      driver: none
   postgres:
-    image: mdillon/postgis
+    labels:
+      org.fiware: 'tutorial'
+    image: postgis/postgis
     hostname: postgres
     container_name: db-postgres
     networks:
@@ -56,34 +67,33 @@ services:
       POSTGRES_USER: ngb
       POSTGRES_PASSWORD: ngb
       POSTGRES_DB: ngb
-
+    logging:
+      driver: none
   scorpio:
-    image: scorpiobroker/scorpio:scorpio-aaio_${SCORPIO_VERSION}
+    labels:
+      org.fiware: 'tutorial'
+    image: scorpiobroker/scorpio:scorpio-aaio-no-eureka_${SCORPIO_VERSION}
     hostname: scorpio
     container_name: fiware-scorpio
     networks:
       - default
     ports:
       - "${SCORPIO_PORT}:9090"
     depends_on:
-      - kafka
       - postgres
-    #healthcheck:
-    #  test: curl --fail -s http://scorpio:${SCORPIO_PORT}/scorpio/v1/info/ || exit 1
-    deploy:
-      resources:
-        limits:
-          cpus: '0.8'
-          memory: 640M
-        reservations:
-          cpus: '0.6'
-          memory: 480M
+      - kafka
 
-  # Tutorial connects to the Scorpio Broker
+  # 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
+
+
+networks:
+  default:
+    labels:
+      org.fiware: 'tutorial'

docker-compose/stellio.yml

@@ -1,4 +1,22 @@
-version: "3.8"
+# WARNING: Do not deploy this tutorial configuration directly to a production environment
+#
+# The tutorial docker-compose files have not been written for production deployment and will not 
+# scale. A proper architecture has been sacrificed to keep the narrative focused on the learning 
+# goals, they are just used to deploy everything onto a single Docker machine. All FIWARE components 
+# are running at full debug and extra ports have been exposed to allow for direct calls to services. 
+# They also contain various obvious security flaws - passwords in plain text, no load balancing,
+# no use of HTTPS and so on. 
+# 
+# This is all to avoid the need of multiple machines, generating certificates, encrypting secrets
+# and so on, purely so that a single docker-compose file can be read as an example to build on, 
+# not use directly. 
+# 
+# When deploying to a production environment, please refer to the Helm Repository
+# for FIWARE Components in order to scale up to a proper architecture:
+# 
+# see: https://github.com/FIWARE/helm-charts/
+#
+version: '3.9'
 services:
   api-gateway:
     container_name: stellio-api-gateway
@@ -156,7 +174,7 @@ services:
       - 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
 
 volumes:
   neo4j-db: ~

services

@@ -7,7 +7,7 @@
 
 set -e
 
-SCORPIO="http://scorpio:9090/scorpio/v1/info/"
+SCORPIO="http://scorpio:9090/"
 ORION="http://orion:1026/version"
 STELLIO="http://localhost:8080/actuator/health"
 CONTEXT="https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld"
@@ -56,14 +56,7 @@ waitForScorpio () {
 	getHeartbeat "${SCORPIO}"
 	while [ "${response}" -eq 000 ]
 	do
-		echo -e "Context Broker HTTP state: ${response} (waiting for 500)"
-		pause 60
-		getHeartbeat "${SCORPIO}"
-	done
-	echo -e "\n⏳ Waiting for all \033[1;34mScorpio\033[0m services to be fully available\n"
-	while [ "$response" -eq 500 ]
-	do
-		echo -e "Context Broker HTTP state: ${response} (waiting for 200)"
+		echo -e "Context Broker HTTP state: ${response} (waiting for 404)"
 		pause 60
 		getHeartbeat "${SCORPIO}"
 	done