File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -233,9 +233,24 @@ docker-build:
233233docker-up :
234234 @docker --version
235235 @docker compose up -d
236- @sleep 15
237- @docker compose ps
238- @docker compose logs
236+ @for i in $$(seq 1 60 ) ; do \
237+ if [ " $$ (docker compose ps --format json | jq -r '.Health' | grep -c '^healthy$$ ')" -eq 3 ]; then \
238+ echo " " ; \
239+ echo " All containers healthy. Sleeping for 15s anyway" ; \
240+ sleep 15; \
241+ break ; \
242+ fi ; \
243+ printf " ." ; \
244+ sleep 1; \
245+ docker compose ps; \
246+ if [ $$ i -eq 60 ]; then \
247+ echo " " ; \
248+ echo " Timed out" ; \
249+ docker compose ps; \
250+ docker compose logs; \
251+ exit 1; \
252+ fi ; \
253+ done
239254
240255.PHONY : docker-stop
241256docker-stop :
Original file line number Diff line number Diff line change @@ -22,10 +22,9 @@ services:
2222 && es-gencert-cli create-node -out ./node1 -ip-addresses 127.0.0.1,172.30.240.11 -dns-names localhost
2323 && es-gencert-cli create-node -out ./node2 -ip-addresses 127.0.0.1,172.30.240.12 -dns-names localhost
2424 && es-gencert-cli create-node -out ./node3 -ip-addresses 127.0.0.1,172.30.240.13 -dns-names localhost"
25- && find . -type d -exec chmod 755 {} \;
26- && find . -type f -name '*.key' -exec chmod 644 {} \;
27- && find . -type f -name '*.crt' -exec chmod 644 {} \;
28- # && find . -type f -print0 | xargs -0 chmod 666"
25+ && chmod -R a+rX /certs
26+ && ls -lR /certs
27+ # && find . -type f -print0 | xargs -0 chmod 666"
2928 volumes :
3029 - " ./certs:/certs"
3130 depends_on :
You can’t perform that action at this time.
0 commit comments