Merge pull request #13937 from smatvienko-tb/hotfix/bitnamilegacy_rc

Hotfix/bitnamilegacy rc

dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java

@@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit;
 public class AbstractRedisClusterContainer {
 
     static final String NODES = "127.0.0.1:6371,127.0.0.1:6372,127.0.0.1:6373,127.0.0.1:6374,127.0.0.1:6375,127.0.0.1:6376";
-    static final String IMAGE = "bitnami/valkey-cluster:8.0";
+    static final String IMAGE = "bitnamilegacy/valkey-cluster:8.0";
     static final Map<String,String> ENVS = Map.of(
             "VALKEY_CLUSTER_ANNOUNCE_IP", "127.0.0.1",
             "VALKEY_CLUSTER_DYNAMIC_IPS", "no",

dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java

@@ -27,7 +27,7 @@ import java.util.List;
 public class AbstractRedisContainer {
 
     @ClassRule(order = 0)
-    public static GenericContainer redis = new GenericContainer("bitnami/valkey:8.0")
+    public static GenericContainer redis = new GenericContainer("bitnamilegacy/valkey:8.0")
             .withEnv("ALLOW_EMPTY_PASSWORD","yes")
             .withLogConsumer(s -> log.warn(((OutputFrame) s).getUtf8String().trim()))
             .withExposedPorts(6379);

dao/src/test/java/org/thingsboard/server/dao/RedisJUnit5Test.java

@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class RedisJUnit5Test {
 
     @Container
-    private static final GenericContainer REDIS = new GenericContainer("bitnami/valkey:8.0")
+    private static final GenericContainer REDIS = new GenericContainer("bitnamilegacy/valkey:8.0")
             .withEnv("ALLOW_EMPTY_PASSWORD","yes")
             .withLogConsumer(s -> log.error(((OutputFrame) s).getUtf8String().trim()))
             .withExposedPorts(6379);

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:

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:

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:

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"

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'