From 0afdef11a4e7be32c2f35eabedacc12ecfeee92b Mon Sep 17 00:00:00 2001
From: manan164 <1897158+manan164@users.noreply.github.com>
Date: Tue, 11 Jul 2023 19:46:33 +0530
Subject: [PATCH] Fix docker builds.

---
 docker/grpc/docker-compose.yaml                   | 14 ++++++++++++++
 docker/server/config/config-local.properties      |  2 +-
 docker/server/config/config-mysql-grpc.properties |  3 ++-
 docker/server/config/config-mysql.properties      |  2 ++
 docker/server/config/config-postgres.properties   |  2 ++
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/docker/grpc/docker-compose.yaml b/docker/grpc/docker-compose.yaml
index a212bc8899..40a75625b7 100644
--- a/docker/grpc/docker-compose.yaml
+++ b/docker/grpc/docker-compose.yaml
@@ -16,11 +16,14 @@ services:
       - 8090:8090
     links:
       - elasticsearch:es
+      - redis:rs
     depends_on:
       elasticsearch:
         condition: service_healthy
       mysql:
         condition: service_healthy
+      redis:
+        condition: service_healthy
 
   conductor-ui:
     environment:
@@ -57,6 +60,17 @@ services:
       timeout: 5s
       retries: 12
 
+  redis:
+    image: redis:6.2.3-alpine
+    volumes:
+      - ./redis.conf:/usr/local/etc/redis/redis.conf
+    networks:
+      - internal
+    ports:
+      - 6379:6379
+    healthcheck:
+      test: [ "CMD", "redis-cli","ping" ]
+
   elasticsearch:
     image: elasticsearch:6.8.15
     environment:
diff --git a/docker/server/config/config-local.properties b/docker/server/config/config-local.properties
index 3fdd23b713..fa2cd25957 100755
--- a/docker/server/config/config-local.properties
+++ b/docker/server/config/config-local.properties
@@ -3,7 +3,7 @@ conductor.grpc-server.enabled=false
 
 # Database persistence model.
 conductor.db.type=redis_standalone
-
+conductor.queue.type=redis_standalone
 # Dynomite Cluster details.
 # format is host:port:rack separated by semicolon
 conductor.redis.hosts=rs:6379:us-east-1c
diff --git a/docker/server/config/config-mysql-grpc.properties b/docker/server/config/config-mysql-grpc.properties
index 2582b4d89f..6ed6563dc3 100755
--- a/docker/server/config/config-mysql-grpc.properties
+++ b/docker/server/config/config-mysql-grpc.properties
@@ -16,7 +16,8 @@ conductor.grpc-server.enabled=true
 
 # Database persistence model.
 conductor.db.type=mysql
-
+conductor.queue.type=redis_standalone
+conductor.redis.hosts=rs:6379:us-east-1c
 spring.datasource.url=jdbc:mysql://mysql:3306/conductor
 spring.datasource.username=conductor
 spring.datasource.password=conductor
diff --git a/docker/server/config/config-mysql.properties b/docker/server/config/config-mysql.properties
index 7600398307..d5effd8d6d 100755
--- a/docker/server/config/config-mysql.properties
+++ b/docker/server/config/config-mysql.properties
@@ -3,6 +3,8 @@ conductor.grpc-server.enabled=false
 
 # Database persistence type.
 conductor.db.type=mysql
+conductor.queue.type=redis_standalone
+conductor.redis.hosts=rs:6379:us-east-1c
 
 spring.datasource.url=jdbc:mysql://mysql:3306/conductor
 spring.datasource.username=conductor
diff --git a/docker/server/config/config-postgres.properties b/docker/server/config/config-postgres.properties
index 2a27a5cac3..e1b3cc8fde 100755
--- a/docker/server/config/config-postgres.properties
+++ b/docker/server/config/config-postgres.properties
@@ -3,6 +3,8 @@ conductor.grpc-server.enabled=false
 
 # Database persistence type.
 conductor.db.type=postgres
+conductor.queue.type=redis_standalone
+conductor.redis.hosts=rs:6379:us-east-1c
 
 spring.datasource.url=jdbc:postgresql://postgres:5432/conductor
 spring.datasource.username=conductor