Remove workaround needed for running gsh

docker · Oct 17, 2018 · a5516b2 · a5516b2
1 parent 843097d
commit a5516b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -2,10 +2,4 @@ FROM tier/grouper:2.3.0-a109-u47-w12-p21
 
 LABEL author="tier-packaging@internet2.edu <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"]