Skip to content

Commit 1b07bf2

Browse files
committed
Update docker compose template
Signed-off-by: Victor Chang <[email protected]>
1 parent 9b19735 commit 1b07bf2

File tree

1 file changed

+27
-24
lines changed

1 file changed

+27
-24
lines changed

docker-compose/docker-compose.yml

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ services:
2727
RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
2828
healthcheck:
2929
test: rabbitmq-diagnostics -q ping
30-
interval: 15s
30+
start_period: 10s
31+
interval: 5s
3132
timeout: 30s
32-
retries: 3
33+
retries: 5
3334
networks:
3435
- monaideploy
3536

@@ -48,32 +49,30 @@ services:
4849
MINIO_ROOT_PASSWORD: minioadmin
4950
healthcheck:
5051
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
51-
interval: 15s
52+
start_period: 10s
53+
interval: 5s
5254
timeout: 30s
53-
retries: 3
55+
retries: 5
5456
networks:
5557
- monaideploy
5658

57-
#createbuckets:
58-
# image: minio/mc
59-
# environment:
60-
# MINIO_ROOT_USER: minioadmin
61-
# MINIO_ROOT_PASSWORD: minioadmin
62-
# BUCKET_NAME: monaideploy
63-
# ENDPOINT: http://minio:9000
64-
# depends_on:
65-
# minio:
66-
# condition: service_healthy
67-
# networks:
68-
# - monaideploy
69-
# entrypoint: >
70-
# /bin/sh -c "
71-
# until (/usr/bin/mc config host add myminio $$ENDPOINT $$MINIO_ROOT_USER $$MINIO_ROOT_PASSWORD) do echo '...waiting...' && sleep 1; done;
72-
# /usr/bin/mc mb myminio/$$BUCKET_NAME;
73-
# /usr/bin/mc policy set public myminio/$$BUCKET_NAME;
74-
# /usr/bin/mc ls myminio;
75-
# # exit 0
76-
# "
59+
mongodb:
60+
image: mongo:5.0.12
61+
environment:
62+
MONGO_INITDB_ROOT_USERNAME: root
63+
MONGO_INITDB_ROOT_PASSWORD: rootpassword
64+
ports:
65+
- 27017:27017
66+
volumes:
67+
- ./.run/mongodb/:/data/db
68+
networks:
69+
- monaideploy
70+
healthcheck:
71+
test: echo 'db.runCommand("ping").ok' | mongo localhost:27017/productiondb --quiet
72+
interval: 10s
73+
timeout: 10s
74+
retries: 5
75+
start_period: 40s
7776

7877
orthanc:
7978
image: "jodogne/orthanc-plugins"
@@ -96,6 +95,7 @@ services:
9695
timeout: 30s
9796

9897
elasticsearch:
98+
profiles: [ 'elk' ]
9999
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
100100
hostname: elasticsearch
101101
volumes:
@@ -118,6 +118,7 @@ services:
118118
retries: 50
119119

120120
logstash:
121+
profiles: [ 'elk' ]
121122
image: docker.elastic.co/logstash/logstash:${ELASTIC_VERSION}
122123
volumes:
123124
- ./configs/logstash.yml:/usr/share/logstash/config/logstash.yml:ro,Z
@@ -140,6 +141,7 @@ services:
140141
- monaideploy
141142

142143
kibana:
144+
profiles: [ 'elk' ]
143145
image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION}
144146
volumes:
145147
- ./configs/kibana.yml:/usr/share/kibana/config/kibana.yml:ro,Z
@@ -159,6 +161,7 @@ services:
159161
retries: 120
160162

161163
kibana-setup:
164+
profiles: [ 'elk' ]
162165
image: curlimages/curl:latest
163166
volumes:
164167
- ./configs/kibana.ndjson:/usr/share/kibana.ndjson

0 commit comments

Comments
 (0)