updating due to base image changes

docker · May 21, 2018 · 7c9d00d · 7c9d00d
1 parent 2be3d6f
commit 7c9d00d
Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/base/container_files/usr-local-bin/grouper b/base/container_files/usr-local-bin/grouper
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-rm /tmp/logpipe
-
 . /usr/local/bin/library.sh
 
 prepDaemon

diff --git a/full-demo/Dockerfile b/full-demo/Dockerfile
@@ -16,9 +16,9 @@ RUN (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
     && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 3; done; \
-    . /usr/local/bin/library.sh; \
-    prepDaemon; \
-    cd /opt/grouper/grouper.apiBinary \
+    . /usr/local/bin/library.sh \
+    && prepConf \
+    && cd /opt/grouper/grouper.apiBinary \
     && bin/gsh /seed-data/demo.gsh \
     && pkill -HUP slapd \
     && while curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to stop; sleep 1; done; \