From 96d486e3ae304ec6119dd616b2ecba21a18249df Mon Sep 17 00:00:00 2001 From: Eric Mustin Date: Mon, 29 Sep 2025 11:46:32 -0400 Subject: [PATCH 1/2] chore: fallback to legacy for workflow as we cannot modify entrypoint, and fix docker compose format --- .github/workflows/ci-instrumentation-with-services.yml | 5 ++--- docker-compose.yml | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-instrumentation-with-services.yml b/.github/workflows/ci-instrumentation-with-services.yml index 9723732997..984c530f27 100644 --- a/.github/workflows/ci-instrumentation-with-services.yml +++ b/.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 diff --git a/docker-compose.yml b/docker-compose.yml index be514c3795..033863a1dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -206,11 +206,11 @@ services: 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 + healthcheck: + test: ["CMD-SHELL", "sh -c 'redis-cli -a \"$REDIS_PASSWORD\" ping | grep PONG'"] + interval: 10s + timeout: 5s + retries: 5 rabbitmq: image: rabbitmq:3.8-alpine From 3ebc7a3fb13fb883d555b2096622d7dd66670aff Mon Sep 17 00:00:00 2001 From: Eric Mustin Date: Mon, 29 Sep 2025 12:07:00 -0400 Subject: [PATCH 2/2] chore: fallback to legacy bitnami for now --- docker-compose.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 033863a1dc..3fa334e83c 100644 --- a/docker-compose.yml +++ b/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}"] - healthcheck: - test: ["CMD-SHELL", "sh -c 'redis-cli -a \"$REDIS_PASSWORD\" ping | grep PONG'"] - interval: 10s - timeout: 5s - retries: 5 rabbitmq: image: rabbitmq:3.8-alpine