back to compose

Author: bogdan-rosianu

.github/workflows/e2e-state-accesses.yml

@@ -24,51 +24,11 @@ jobs:
           timeout=180; start=$(date +%s)
           wait_port() { local host=$1 port=$2 name=$3; echo "Waiting for $name on $host:$port"; while ! nc -z "$host" "$port"; do now=$(date +%s); [ $((now-start)) -gt $timeout ] && { echo "$name not ready" >&2; docker compose -f src/test/chain-simulator/docker/docker-compose.state-e2e.yml ps; exit 1; } || sleep 2; done; echo "$name ready"; }
           wait_port 127.0.0.1 27017 MongoDB
+          wait_port 127.0.0.1 6379 Redis
+          wait_port 127.0.0.1 26379 Sentinel
           wait_port 127.0.0.1 5672 RabbitMQ
           for i in {1..60}; do if curl -sf http://127.0.0.1:15672 >/dev/null; then break; fi; sleep 2; done
 
-      - name: Install and start Redis + Sentinel on host
-        run: |
-          set -euxo pipefail
-          sudo apt-get update
-          sudo apt-get install -y redis-server
-
-          # Stop any auto-started Redis to avoid conflicts
-          sudo systemctl stop redis-server || true
-
-          # Start a dedicated Redis (daemonized) bound to localhost:6379
-          if ! nc -z 127.0.0.1 6379; then
-            printf "%s\n" \
-              "port 6379" \
-              "daemonize yes" \
-              "pidfile ./redis-6379.pid" \
-              "bind 127.0.0.1" \
-              "save \"\"" \
-              "appendonly no" \
-              > redis-6379.conf
-            redis-server redis-6379.conf
-          fi
-
-          # Start a dedicated Redis Sentinel on 26379 watching 127.0.0.1:6379
-          if ! nc -z 127.0.0.1 26379; then
-            printf "%s\n" \
-              "port 26379" \
-              "daemonize yes" \
-              "pidfile ./redis-sentinel.pid" \
-              "bind 127.0.0.1" \
-              "sentinel monitor mymaster 127.0.0.1 6379 1" \
-              "sentinel down-after-milliseconds mymaster 5000" \
-              "sentinel failover-timeout mymaster 60000" \
-              "sentinel parallel-syncs mymaster 1" \
-              > sentinel.conf
-            redis-sentinel sentinel.conf
-          fi
-
-          # Wait for ports to be open
-          timeout=60; start=$(date +%s)
-          until nc -z 127.0.0.1 6379; do now=$(date +%s); [ $((now-start)) -gt $timeout ] && { echo "Redis failed to start" >&2; exit 1; } || sleep 1; done
-          until nc -z 127.0.0.1 26379; do now=$(date +%s); [ $((now-start)) -gt $timeout ] && { echo "Redis Sentinel failed to start" >&2; cat redis-sentinel.pid 2>/dev/null || true; exit 1; } || sleep 1; done
-
       - name: Setup Go
         uses: actions/setup-go@v5
         with:

src/test/chain-simulator/docker/docker-compose.state-e2e.yml

@@ -26,6 +26,38 @@ services:
       timeout: 5s
       retries: 15
 
+  redis-master:
+    image: bitnami/redis:7
+    container_name: statee2e-redis-master
+    environment:
+      - REDIS_REPLICATION_MODE=master
+      - ALLOW_EMPTY_PASSWORD=yes
+    ports:
+      - "6379:6379"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+
+  redis-sentinel:
+    image: bitnami/redis-sentinel:7
+    container_name: statee2e-redis-sentinel
+    depends_on:
+      - redis-master
+    environment:
+      - REDIS_MASTER_SET=mymaster
+      - REDIS_MASTER_HOST=redis-master
+      - ALLOW_EMPTY_PASSWORD=yes
+      - REDIS_SENTINEL_DOWN_AFTER_MILLISECONDS=10000
+    ports:
+      - "26379:26379"
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli -p 26379 ping | grep PONG"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+
 networks:
   default:
     name: statee2e-net