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
---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 1f5c9b5d99..b98d198afd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,4 +18,5 @@ RUN ./docker/build.sh
 # Configure Docker Container
 VOLUME ["/data"]
 EXPOSE 22 3000
-CMD ["docker/start.sh"]
+ENTRYPOINT ["docker/start.sh"]
+CMD ["/usr/bin/s6-svscan", "/app/gogs/docker/s6/"]
-- 
cgit v1.2.3