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

Commit 3ec8288

Browse files
Merge pull request #2317 from michaelpaliy/fix/grpcDockerCompose#2303
fix grpc docker compose
2 parents 2294609 + b78b0b3 commit 3ec8288

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

docker/grpc/docker-compose.yaml

+11-5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ services:
1414
ports:
1515
- 8080:8080
1616
- 8090:8090
17+
links:
18+
- elasticsearch:es
1719
depends_on:
1820
elasticsearch:
1921
condition: service_healthy
@@ -35,12 +37,12 @@ services:
3537
- conductor-server
3638

3739
mysql:
38-
image: mysql:5.6
40+
image: mysql:5.7
3941
environment:
4042
MYSQL_ROOT_PASSWORD: 12345
4143
MYSQL_DATABASE: conductor
4244
MYSQL_USER: conductor
43-
MYSQL_PASSWORD: password
45+
MYSQL_PASSWORD: conductor
4446
volumes:
4547
- type: volume
4648
source: conductor_mysql
@@ -55,11 +57,10 @@ services:
5557
timeout: 5s
5658
retries: 12
5759

58-
# https://www.elastic.co/guide/en/elasticsearch/reference/5.6/docker.html
5960
elasticsearch:
60-
image: docker.elastic.co/elasticsearch/elasticsearch:5.6.8
61+
image: elasticsearch:6.8.15
6162
environment:
62-
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
63+
- "ES_JAVA_OPTS=-Xms512m -Xmx1024m"
6364
- transport.host=0.0.0.0
6465
- discovery.type=single-node
6566
- xpack.security.enabled=false
@@ -73,6 +74,11 @@ services:
7374
interval: 5s
7475
timeout: 5s
7576
retries: 12
77+
logging:
78+
driver: "json-file"
79+
options:
80+
max-size: "1k"
81+
max-file: "3"
7682

7783
volumes:
7884
conductor_mysql:

0 commit comments

Comments
 (0)