Merge pull request #317 from NorskHelsenett/feature/remove-redis-in-f…

…avour-of-valkey-in-docker-compose-setup Feature/remove redis in favor of valkey in docker compose setup
NorskHelsenett · Feb 3, 2025 · da31fce · da31fce
2 parents 5d68ec9 + f407171
commit da31fce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/hacks/docker-compose/api.yaml b/hacks/docker-compose/api.yaml
@@ -32,7 +32,7 @@ services:
       - ENABLE_TRACING=false
       - PROFILER_ENABLED=false
       - RABBITMQ_HOST=rabbitmq
-      - REDIS_HOST=redis
+      - REDIS_HOST=valkey
       - MONGODB_HOST=mongodb
       - HEALTHCHECK_ENDPOINT=localhost:9999
     volumes:

diff --git a/hacks/docker-compose/infrastructure.yaml b/hacks/docker-compose/infrastructure.yaml
@@ -113,7 +113,7 @@ services:
         condition: service_healthy
       rabbitmq:
         condition: service_healthy
-      redis:
+      valkey:
         condition: service_healthy
     links:
       - mongodb
@@ -167,16 +167,16 @@ services:
       - jaeger
     ports:
       - '4317:4317'
-  redis:
-    image: ${DOCKER_MIRROR}redis/redis-stack
+  valkey:
+    image: ${DOCKER_MIRROR}valkey/valkey
     environment:
-      REDIS_ARGS: '--requirepass S3cret!'
+      VALKEY_EXTRA_FLAGS: '--requirepass S3cret!'
     volumes:
-      - ../data/redis/data:/data
+      - ../data/valkey/data:/data
     ports:
       - '6379:6379'
       - '8001:8001'
     healthcheck:
-      test: ['CMD', 'redis-cli', 'ping']
+      test: ['CMD', 'valkey-cli', 'ping']
 volumes:
   data: {}
diff --git a/hacks/docker-compose/vault/entrypoint.sh b/hacks/docker-compose/vault/entrypoint.sh
@@ -172,7 +172,7 @@ vault write database/config/redis \
 
 vault write database/roles/redis-ror-api-role \
     db_name="redis" \
-    creation_statements='["~*", "+@string", "+PING","+json.get", "+json.set"]' \
+    creation_statements='["~*", "+@string", "+PING"]' \
     default_ttl="5m" \
     max_ttl="1h"