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 @context.postman_collection.json

@@ -126,7 +126,7 @@
 						""
 					]
 				},
-				"description": "New context data entities can be created by making a POST request to the `/ngsi-ld/v1/entities` endpoint and supply an `@context` along with structured **NGSI-LD** data.\n\nThe first request will take some time, as the context broker must navigate and load all of the files mentioned in the\n`@context`.\n\nSince the `Content-Type: application/ld+json` the `@context` is supplied in the body of the request. As with all **NGSI-LD** interactions, the core **NGSI-LD** `@context` ([`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld) is implicitly included as well.)\n\nThis means that the actual `@context` is:\n\n```jsonld\n{\n    \"@context\": [\n        \"http://context-provider:3000/data-models/ngsi-context.jsonld\",\n        \"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld\"\n    ]\n}\n```\n\nwith the core `@context` being processed **last** and therefore overriding any terms previously defined with the same `@id`."
+				"description": "New context data entities can be created by making a POST request to the `/ngsi-ld/v1/entities` endpoint and supply an `@context` along with structured **NGSI-LD** data.\n\nThe first request will take some time, as the context broker must navigate and load all of the files mentioned in the\n`@context`.\n\nSince the `Content-Type: application/ld+json` the `@context` is supplied in the body of the request. As with all **NGSI-LD** interactions, the core **NGSI-LD** `@context` ([`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld) is implicitly included as well.)\n\nThis means that the actual `@context` is:\n\n```jsonld\n{\n    \"@context\": [\n        \"http://context-provider:3000/data-models/ngsi-context.jsonld\",\n        \"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld\"\n    ]\n}\n```\n\nwith the core `@context` being processed **last** and therefore overriding any terms previously defined with the same `@id`."
 			},
 			"response": []
 		},
@@ -245,7 +245,7 @@
 						}
 					]
 				},
-				"description": "This example returns the data of all `Building` entities within the context data The `type` parameter is mandatory for\nNGSI-LD and is used to filter the response. The Accept HTTP header is needed to retrieve JSON-LD content in the response body.\n\nSince no explicit `@context` was sent in the request, the response returns the Core `@context` by default (`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`) and\nall attributes are expanded whenever possible.\n\n-   `id`, `type`, `location` and `name`are defined in the core context and are not expanded.\n-   `address` has been mapped to `http://schema.org/address`\n-   `category` has been mapped to `https://uri.fiware.org/ns/data-models#category`\n\nNote that if an attribute has not been not associated to an FQN when the entity was created, the short name will\n**always** be displayed."
+				"description": "This example returns the data of all `Building` entities within the context data The `type` parameter is mandatory for\nNGSI-LD and is used to filter the response. The Accept HTTP header is needed to retrieve JSON-LD content in the response body.\n\nSince no explicit `@context` was sent in the request, the response returns the Core `@context` by default (`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld`) and\nall attributes are expanded whenever possible.\n\n-   `id`, `type`, `location` and `name`are defined in the core context and are not expanded.\n-   `address` has been mapped to `http://schema.org/address`\n-   `category` has been mapped to `https://uri.fiware.org/ns/data-models#category`\n\nNote that if an attribute has not been not associated to an FQN when the entity was created, the short name will\n**always** be displayed."
 			},
 			"response": []
 		},

docker-compose/stellio.yml

@@ -9,6 +9,8 @@ services:
       - SPRING_PROFILES_ACTIVE=docker
     ports:
       - "${EXPOSED_PORT}:${STELLIO_PORT}"
+    networks:
+      - default
 
   search-service:
     container_name: stellio-search-service
@@ -32,6 +34,8 @@ services:
       - APPLICATION_PAGINATION_LIMIT-MAX=1000
     ports:
       - 8083:8083
+    networks:
+      - default
     restart: always
     depends_on:
       postgres:
@@ -43,7 +47,7 @@ services:
     container_name: stellio-subscription-service
     labels:
       org.fiware: 'tutorial'
-    image: quay.io/fiware/stellio-subscription-service:${STELLIO_DOCKER_TAG}
+    image: quay.io/fiware/stellio-subscription-service:${STELLIO_DOCKER_TAG}    
     environment:
       - SPRING_PROFILES_ACTIVE=docker
       - SPRING_R2DBC_URL=r2dbc:postgresql://postgres/stellio_subscription
@@ -61,6 +65,8 @@ services:
       - APPLICATION_PAGINATION_LIMIT-MAX=1000
     ports:
       - 8085:8084
+    networks:
+      - default
     restart: always
     depends_on:
       postgres:
@@ -71,10 +77,12 @@ 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
+    networks:
+      - default
     restart: always
     environment:
       KAFKA_BROKER_ID: 1
@@ -88,17 +96,14 @@ 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
   postgres:
     labels:
       org.fiware: 'tutorial'
     image: stellio/stellio-timescale-postgis:${STELLIO_TIMESCALE_POSTGIS}
-
     hostname: postgres
     container_name: db-postgres
     environment:
@@ -109,6 +114,8 @@ services:
       - ACCEPT_TIMESCALE_TUNING=TRUE
     ports:
       - 5432:5432
+    networks:
+      - default
     volumes:
       - postgres-db:/var/lib/postgresql
     healthcheck: