Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Fix docker builds. #3692

Merged
merged 1 commit into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions docker/grpc/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker/server/config/config-local.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion docker/server/config/config-mysql-grpc.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions docker/server/config/config-mysql.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions docker/server/config/config-postgres.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down