Use stack-based images

Author: uglide

Diff for: .github/actions/run-tests/action.yml

@@ -50,26 +50,26 @@ runs:
         
           # Mapping of redis version to stack version  
           declare -A redis_stack_version_mapping=(
-            ["7.4.1"]="7.4.0-v1"
-            ["7.2.6"]="7.2.0-v13"
-            ["6.2.16"]="6.2.6-v17"
+            ["7.4.1"]="rs-7.4.0-v1"
+            ["7.2.6"]="rs-7.2.0-v13"
+            ["6.2.16"]="rs-6.2.6-v17"
           )
                   
           if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
-            export REDIS_STACK_IMAGE="redis/redis-stack-server:${redis_stack_version_mapping[$REDIS_VERSION]}"            
+            export CLIENT_LIBS_TEST_IMAGE="redislabs/client-libs-test:${redis_stack_version_mapping[$REDIS_VERSION]}"            
           else
             echo "Version not found in the mapping."
             exit 1
           fi
                   
-          if (( redis_major_version < 7 )); then
-            export REDIS_STACK_EXTRA_ARGS="--tls-auth-clients optional --save ''"
+          if (( redis_major_version < 7 )); then            
             export REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"            
           fi           
 
           docker compose --profile all-stack -f tests/dockers/docker-compose.yml up -d --build
         else
-          echo "Using redis CE for module tests"         
+          echo "Using redis CE for module tests"
+          export CLIENT_LIBS_TEST_IMAGE="redislabs/client-libs-test:$REDIS_VERSION"     
           docker compose --profile all -f tests/dockers/docker-compose.yml up -d --build         
         fi        
       shell: bash

Diff for: tests/dockers/docker-compose.yml

@@ -3,7 +3,7 @@
 services:
 
   redis:
-    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v1}
     container_name: redis-standalone
     environment:
       - TLS_ENABLED=yes
@@ -18,11 +18,10 @@ services:
       - "./standalone:/redis/work"
     profiles:
       - standalone
-      - all-stack
       - all
 
   cluster:
-    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v1}
     container_name: redis-cluster
     environment:
       - REDIS_CLUSTER=yes
@@ -39,24 +38,4 @@ services:
       - "./cluster:/redis/work"
     profiles:
       - cluster
-      - all-stack
-      - all  
-
-  redis-stack:
-    image: ${REDIS_STACK_IMAGE:-redis/redis-stack-server:edge}
-    container_name: redis-stack
-    ports:
-      - 6479:6379
-    environment:
-      - "REDIS_ARGS=${REDIS_STACK_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --save ''}"
-    profiles:
-      - standalone
-      - all-stack
-
-  redis-stack-graph:
-    image: redis/redis-stack-server:6.2.6-v15
-    container_name: redis-stack-graph
-    ports:
-      - 6480:6379
-    profiles:
-      - graph
+      - all