Merge branch 'main' into feat-bump-min-api-version

Author: kaylareopelle

.github/workflows/ci-instrumentation-with-services.yml

@@ -212,12 +212,11 @@ jobs:
           build: true
     services:
       redis:
-        image: redis:6.2
+        image: bitnamilegacy/redis:6.2
         ports:
           - 6379:6379
-        command: ["redis-server", "--appendonly", "yes", "--requirepass", "${REDIS_PASSWORD}"]
         options: >-
-          --health-cmd "sh -c 'redis-cli -a \"$REDIS_PASSWORD\" ping | grep PONG'"
+          --health-cmd "redis-cli ping"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5

docker-compose.yml

@@ -198,19 +198,13 @@ services:
       - postgres_socket:/var/run/postgresql
 
   redis:
-    image: redis:6.2
+    image: bitnamilegacy/redis:6.2
     environment:
       - REDIS_PASSWORD=passw0rd
     volumes:
       - redis_data:/data
     ports:
       - "16379:6379"
-    command: ["redis-server", "--appendonly", "yes", "--requirepass", "${REDIS_PASSWORD}"]
-    options: >-
-      --health-cmd "sh -c 'redis-cli -a \"$REDIS_PASSWORD\" ping | grep PONG'"
-      --health-interval 10s
-      --health-timeout 5s
-      --health-retries 5
 
   rabbitmq:
     image: rabbitmq:3.8-alpine