From b50a4599ec6236cd37140587892fa6bd3d007bd9 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Thu, 28 Aug 2025 17:10:05 +0200
Subject: [PATCH] move bitnami to bitnamilegacy - docker compose

---
 docker/docker-compose.kafka.yml                      |  2 +-
 docker/docker-compose.valkey-cluster.yml             | 12 ++++++------
 docker/docker-compose.valkey-sentinel.yml            |  6 +++---
 docker/docker-compose.valkey.yml                     |  2 +-
 .../src/test/resources/docker-compose.valkey-ssl.yml |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
index 026070cc89..06bafafc61 100644
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@@ -17,7 +17,7 @@
 services:
   kafka:
     restart: always
-    image: "bitnami/kafka:4.0"
+    image: "bitnamilegacy/kafka:4.0"
     ports:
       - "9092:9092"
     env_file:
diff --git a/docker/docker-compose.valkey-cluster.yml b/docker/docker-compose.valkey-cluster.yml
index 242fabf44b..b8ce0f96ec 100644
--- a/docker/docker-compose.valkey-cluster.yml
+++ b/docker/docker-compose.valkey-cluster.yml
@@ -18,7 +18,7 @@ services:
 # Valkey cluster
 # The latest version of Valkey compatible with ThingsBoard is 8.0
   valkey-node-0:
-    image: bitnami/valkey-cluster:8.0
+    image: bitnamilegacy/valkey-cluster:8.0
     volumes:
       - ./tb-node/valkey-cluster-data-0:/bitnami/valkey/data
     environment:
@@ -26,7 +26,7 @@ services:
       - 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'
 
   valkey-node-1:
-    image: bitnami/valkey-cluster:8.0
+    image: bitnamilegacy/valkey-cluster:8.0
     volumes:
       - ./tb-node/valkey-cluster-data-1:/bitnami/valkey/data
     depends_on:
@@ -36,7 +36,7 @@ services:
       - 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'
 
   valkey-node-2:
-    image: bitnami/valkey-cluster:8.0
+    image: bitnamilegacy/valkey-cluster:8.0
     volumes:
       - ./tb-node/valkey-cluster-data-2:/bitnami/valkey/data
     depends_on:
@@ -46,7 +46,7 @@ services:
       - 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'
 
   valkey-node-3:
-    image: bitnami/valkey-cluster:8.0
+    image: bitnamilegacy/valkey-cluster:8.0
     volumes:
       - ./tb-node/valkey-cluster-data-3:/bitnami/valkey/data
     depends_on:
@@ -56,7 +56,7 @@ services:
       - 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'
 
   valkey-node-4:
-    image: bitnami/valkey-cluster:8.0
+    image: bitnamilegacy/valkey-cluster:8.0
     volumes:
       - ./tb-node/valkey-cluster-data-4:/bitnami/valkey/data
     depends_on:
@@ -66,7 +66,7 @@ services:
       - 'VALKEY_NODES=valkey-node-0 valkey-node-1 valkey-node-2 valkey-node-3 valkey-node-4 valkey-node-5'
 
   valkey-node-5:
-    image: bitnami/valkey-cluster:8.0
+    image: bitnamilegacy/valkey-cluster:8.0
     volumes:
       - ./tb-node/valkey-cluster-data-5:/bitnami/valkey/data
     depends_on:
diff --git a/docker/docker-compose.valkey-sentinel.yml b/docker/docker-compose.valkey-sentinel.yml
index 3827e0358b..e528a1bb9a 100644
--- a/docker/docker-compose.valkey-sentinel.yml
+++ b/docker/docker-compose.valkey-sentinel.yml
@@ -18,7 +18,7 @@ services:
   # Valkey sentinel
   # The latest version of Valkey compatible with ThingsBoard is 8.0
   valkey-primary:
-    image: 'bitnami/valkey:8.0'
+    image: 'bitnamilegacy/valkey:8.0'
     volumes:
       - ./tb-node/valkey-sentinel-data-primary:/bitnami/valkey/data
     environment:
@@ -26,7 +26,7 @@ services:
       - 'VALKEY_PASSWORD=thingsboard'
 
   valkey-replica:
-    image: 'bitnami/valkey:8.0'
+    image: 'bitnamilegacy/valkey:8.0'
     volumes:
       - ./tb-node/valkey-sentinel-data-replica:/bitnami/valkey/data
     environment:
@@ -38,7 +38,7 @@ services:
       - valkey-primary
 
   valkey-sentinel:
-    image: 'bitnami/valkey-sentinel:8.0'
+    image: 'bitnamilegacy/valkey-sentinel:8.0'
     volumes:
       - ./tb-node/valkey-sentinel-data-sentinel:/bitnami/valkey/data
     environment:
diff --git a/docker/docker-compose.valkey.yml b/docker/docker-compose.valkey.yml
index d4a620820d..3eba086a9b 100644
--- a/docker/docker-compose.valkey.yml
+++ b/docker/docker-compose.valkey.yml
@@ -19,7 +19,7 @@ services:
 # The latest version of Valkey compatible with ThingsBoard is 8.0
   valkey:
     restart: always
-    image: bitnami/valkey:8.0
+    image: bitnamilegacy/valkey:8.0
     environment:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
       ALLOW_EMPTY_PASSWORD: "yes"
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml b/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml
index 8c3029cda1..710dab4690 100644
--- a/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml
+++ b/msa/black-box-tests/src/test/resources/docker-compose.valkey-ssl.yml
@@ -19,7 +19,7 @@ services:
 # The latest version of Valkey compatible with ThingsBoard is 8.0
   valkey:
     restart: always
-    image: bitnami/valkey:8.0
+    image: bitnamilegacy/valkey:8.0
     environment:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - 'ALLOW_EMPTY_PASSWORD=yes'