From 70ff3600eccad493d4e07a093cfac8c7abb37651 Mon Sep 17 00:00:00 2001
From: Ben Yanke <ben@benyanke.com>
Date: Sun, 22 Apr 2018 10:33:31 -0500
Subject: [PATCH] Continuing to work on docker build

---
 Dockerfile                | 7 ++++++-
 build.sh                  | 6 +++---
 docker/default-config.cfg | 0
 docker/start.sh           | 9 +++++++++
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 docker/default-config.cfg
 create mode 100755 docker/start.sh

diff --git a/Dockerfile b/Dockerfile
index cffac0a..99739c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,8 +40,13 @@ ADD sample-simple.cfg /app/config/config.cfg
 # Copy binary from build container
 COPY --from=build /app/glauth /app/glauth
 
+# Copy docker specific scripts from build container
+COPY --from=build /app/docker/start.sh /app/docker/
+COPY --from=build /app/docker/default-config.cfg /app/docker/
+
 # Expose web and LDAP ports
 EXPOSE 389 5555
 
 # To use your own config, mount /app/config, and place config.cfg in mounted volume
-CMD ["/app/glauth", "-c", "/app/config/config.cfg"]
+# CMD ["/app/glauth", "-c", "/app/config/config.cfg"]
+CMD ["/bin/bash", "/app/docker/start.sh"]
diff --git a/build.sh b/build.sh
index 5adc9d7..021bf8b 100755
--- a/build.sh
+++ b/build.sh
@@ -2,8 +2,8 @@
 
 img="localhost/glauth-dev"
 
+sudo docker rmi -f $img
+
 sudo docker build -f Dockerfile -t $img .
 
-# sudo docker run $img --publish-all
-sudo docker run $img
-sudo docker rmi -f $img
+sudo docker run -P $img
diff --git a/docker/default-config.cfg b/docker/default-config.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/docker/start.sh b/docker/start.sh
new file mode 100755
index 0000000..5611681
--- /dev/null
+++ b/docker/start.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Copy config file if it doesn't exist so that the app can start
+if [ ! -f /app/config/config.cfg ] ; then
+  cp /app/docker/default-config.cfg /app/config/config.cfg;
+ fi
+
+# Run app
+/app/glauth -c /app/config/config.cfg