From a5516b2bce5e5c4a31751811ea5b635b4dba004c Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Wed, 17 Oct 2018 12:04:48 +0200 Subject: [PATCH] Remove workaround needed for running gsh --- demo/complex/docker-compose.yml | 2 +- demo/complex/grouper_daemon/Dockerfile | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/demo/complex/docker-compose.yml b/demo/complex/docker-compose.yml index 13b2ad5..f36a4dd 100644 --- a/demo/complex/docker-compose.yml +++ b/demo/complex/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.3" services: grouper_daemon: build: ./grouper_daemon/ -# do NOT put command: here + command: bash -c "while ! curl -s grouper_data:3306 > /dev/null; do echo waiting for mysql on grouper_data to start; sleep 3; done; while ! curl -s ldap://directory:389 > /dev/null; do echo waiting for ldap on directory to start; sleep 3; done; exec daemon" depends_on: - grouper_data - directory diff --git a/demo/complex/grouper_daemon/Dockerfile b/demo/complex/grouper_daemon/Dockerfile index 972742f..55151f3 100644 --- a/demo/complex/grouper_daemon/Dockerfile +++ b/demo/complex/grouper_daemon/Dockerfile @@ -2,10 +2,4 @@ FROM tier/grouper:2.3.0-a109-u47-w12-p21 LABEL author="tier-packaging@internet2.edu " -# This is to allow running gsh on this container interactively - -ENTRYPOINT [] - -CMD bash -c "while ! curl -s grouper_data:3306 > /dev/null; do echo waiting for mysql on grouper_data to start; sleep 3; done; \ - while ! curl -s ldap://directory:389 > /dev/null; do echo waiting for ldap on directory to start; sleep 3; done; \ - /usr/local/bin/entrypoint.sh daemon" +CMD ["daemon"]