From ad5e0b833c0a71a47ac0a0e0d7febc50f5cd739d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Roemer <roemer.jp@gmail.com>
Date: Fri, 2 Oct 2015 21:54:55 +0100
Subject: Docker Container: Init 1 & Initialisation

- Now using a setup script before starting the app. The separation of
the run script and the setup script will make service initialisation a
little bit clearer
- Now calling start.sh script as ENTRYPOINT and S6 as CMD. This way
when running the container with just a shell script, the start.sh
script will be launched before, making debugging easier
- Added note about `.dockerignore` ignored during Docker Hub Automated
Build
---
 docker/start.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'docker/start.sh')

diff --git a/docker/start.sh b/docker/start.sh
index b560b2bc..c824fe91 100755
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -8,5 +8,9 @@ while read NAME CMD; do
     chmod +x /app/gogs/docker/s6/$NAME/run
 done
 
-# Exec S6 as process manager for gogs and dropbear ssh
-exec /usr/bin/s6-svscan /app/gogs/docker/s6/
+# Exec CMD or S6 by default if nothing present
+if [ $# -gt 0 ];then
+    exec "$@"
+else
+    exec /usr/bin/s6-svscan /app/gogs/docker/s6/
+fi
-- 
cgit v1.2.3