feat: upgrade Timescale and Kafka (#1129)

stellio-hub · Aug 8, 2024 · 67f638d · 67f638d
1 parent eb13530
commit 67f638d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 24 deletions.
diff --git a/config/kafka/update_run.sh b/config/kafka/update_run.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   kafka:
-    image: confluentinc/cp-kafka:7.3.1
+    image: confluentinc/cp-kafka:7.6.0
     container_name: stellio-kafka
     hostname: stellio-kafka
     ports:
@@ -18,11 +18,9 @@ services:
       KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
       KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
       KAFKA_LOG4J_ROOT_LOGLEVEL: INFO
-    volumes:
-      - ./config/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: ZGE2MTQ4NDk4NGU3NDE2Mm
   postgres:
-    image: stellio/stellio-timescale-postgis:14-2.11.1-3.3
+    image: stellio/stellio-timescale-postgis:16-2.16.0-3.3
     container_name: stellio-postgres
     environment:
       - POSTGRES_USER=${POSTGRES_USER}

diff --git a/search-service/docker-compose.yml b/search-service/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   kafka:
-    image: confluentinc/cp-kafka:7.3.1
+    image: confluentinc/cp-kafka:7.6.0
     container_name: stellio-kafka
     hostname: stellio-kafka
     ports:
@@ -22,7 +22,7 @@ services:
       - ../config/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'"
   postgres:
-    image: stellio/stellio-timescale-postgis:14-2.11.1-3.3
+    image: stellio/stellio-timescale-postgis:16-2.16.0-3.3
     container_name: stellio-postgres
     environment:
       - POSTGRES_USER=${POSTGRES_USER}

diff --git a/search-service/src/test/kotlin/com/egm/stellio/search/support/WithKafkaContainer.kt b/search-service/src/test/kotlin/com/egm/stellio/search/support/WithKafkaContainer.kt
@@ -10,7 +10,7 @@ interface WithKafkaContainer {
     companion object {
 
         private val kafkaImage: DockerImageName =
-            DockerImageName.parse("confluentinc/cp-kafka:7.3.1")
+            DockerImageName.parse("confluentinc/cp-kafka:7.6.0")
 
         private val kafkaContainer = KafkaContainer(kafkaImage).apply {
             withReuse(true)

diff --git a/search-service/src/test/kotlin/com/egm/stellio/search/support/WithTimescaleContainer.kt b/search-service/src/test/kotlin/com/egm/stellio/search/support/WithTimescaleContainer.kt
@@ -15,7 +15,7 @@ interface WithTimescaleContainer {
         private const val DB_PASSWORD = "stellio_search_db_password"
 
         private val timescaleImage: DockerImageName =
-            DockerImageName.parse("stellio/stellio-timescale-postgis:14-2.11.1-3.3")
+            DockerImageName.parse("stellio/stellio-timescale-postgis:16-2.16.0-3.3")
                 .asCompatibleSubstituteFor("postgres")
 
         private val timescaleContainer = GenericContainer<Nothing>(timescaleImage).apply {

diff --git a/subscription-service/docker-compose.yml b/subscription-service/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   kafka:
-    image: confluentinc/cp-kafka:7.3.1
+    image: confluentinc/cp-kafka:7.6.0
     container_name: stellio-kafka
     hostname: stellio-kafka
     ports:
@@ -22,7 +22,7 @@ services:
       - ../config/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'"
   postgres:
-    image: stellio/stellio-timescale-postgis:14-2.11.1-3.3
+    image: stellio/stellio-timescale-postgis:16-2.16.0-3.3
     container_name: stellio-postgres
     environment:
       - POSTGRES_USER=${POSTGRES_USER}

diff --git a/...iption-service/src/test/kotlin/com/egm/stellio/subscription/support/WithKafkaContainer.kt b/...iption-service/src/test/kotlin/com/egm/stellio/subscription/support/WithKafkaContainer.kt
@@ -10,7 +10,7 @@ interface WithKafkaContainer {
     companion object {
 
         private val kafkaImage: DockerImageName =
-            DockerImageName.parse("confluentinc/cp-kafka:7.3.1")
+            DockerImageName.parse("confluentinc/cp-kafka:7.6.0")
 
         private val kafkaContainer = KafkaContainer(kafkaImage).apply {
             withReuse(true)

diff --git a/...on-service/src/test/kotlin/com/egm/stellio/subscription/support/WithTimescaleContainer.kt b/...on-service/src/test/kotlin/com/egm/stellio/subscription/support/WithTimescaleContainer.kt
@@ -15,7 +15,7 @@ interface WithTimescaleContainer {
         private const val DB_PASSWORD = "stellio_subscription_db_password"
 
         private val timescaleImage: DockerImageName =
-            DockerImageName.parse("stellio/stellio-timescale-postgis:14-2.11.1-3.3")
+            DockerImageName.parse("stellio/stellio-timescale-postgis:16-2.16.0-3.3")
                 .asCompatibleSubstituteFor("postgres")
 
         private val timescaleContainer = GenericContainer<Nothing>(timescaleImage).apply {