From f8e96d41a590401ee080e43a32abdef91a6fb102 Mon Sep 17 00:00:00 2001
From: Benoit Orihuela <benoit.orihuela@egm.io>
Date: Thu, 26 Dec 2024 08:18:15 +0100
Subject: [PATCH 1/2] chore: update Stellio configuration

---
 docker-compose/stellio.yml                 |  7 ++-----
 docker-compose/stellio/kafka/update_run.sh | 11 -----------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100755 docker-compose/stellio/kafka/update_run.sh

diff --git a/docker-compose/stellio.yml b/docker-compose/stellio.yml
index ae71473..d9a3594 100644
--- a/docker-compose/stellio.yml
+++ b/docker-compose/stellio.yml
@@ -95,7 +95,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
@@ -114,9 +114,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: NjYzMTg0NDRjMzU5MTFlZm
 
 
   # Databases
@@ -124,7 +122,6 @@ services:
     labels:
       org.fiware: 'tutorial'
     image: stellio/stellio-timescale-postgis:${STELLIO_TIMESCALE_POSTGIS}
-
     hostname: postgres
     container_name: db-postgres
     environment:
diff --git a/docker-compose/stellio/kafka/update_run.sh b/docker-compose/stellio/kafka/update_run.sh
deleted file mode 100755
index 18de790..0000000
--- a/docker-compose/stellio/kafka/update_run.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Docker workaround: Remove check for KAFKA_ZOOKEEPER_CONNECT parameter
-sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure
-
-# Docker workaround: Ignore cub zk-ready
-sed -i 's/cub zk-ready/echo ignore zk-ready/' /etc/confluent/docker/ensure
-
-# KRaft required step: Format the storage directory with a new cluster ID
-echo "kafka-storage format --ignore-formatted -t $(kafka-storage random-uuid) -c /etc/kafka/kafka.properties" >> /etc/confluent/docker/ensure
-

From 7465c2487d391784f522035cf5bc5eceb27c9afb Mon Sep 17 00:00:00 2001
From: Benoit Orihuela <benoit.orihuela@egm.io>
Date: Thu, 26 Dec 2024 16:34:24 +0100
Subject: [PATCH 2/2] doc: update list of Stellio services

---
 services | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services b/services
index b75cae0..645d8d7 100755
--- a/services
+++ b/services
@@ -207,7 +207,7 @@ case "${command}" in
 		export $(cat .env | grep "#" -v)
 		stoppingContainers
 		waitForCoreContext
-		echo -e "Starting containers:  \033[1;34mStellio (NGSI-LD)\033[0m, \033[1;34mOrion (NGSI-v2)\033[0m, \033[1;34mLepus\033[0m, \033[1mTutorial\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 (NGSI-LD)\033[0m, \033[1;34mOrion (NGSI-v2)\033[0m, \033[1;34mLepus\033[0m, \033[1mTutorial\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 NGSI-LD context broker"
 		echo -e "- \033[1;34mOrion\033[0m is an NGSI-v2 context source"
 		echo -e "- Data models \033[1m@context\033[0m (Smart Supermarket) is supplied externally"
@@ -242,4 +242,4 @@ case "${command}" in
 		echo "usage: services [create|orion|scorpio|stellio|stop]"
 		exit 127;
 		;;
-esac
\ No newline at end of file
+esac