added `app:nginx` argument to launch the nginx webserver

We install nginx and add the argument `app:nginx` to start the nginx
server in the container. This means that nginx and owncloud containers
can be launched on physically separate docker hosts.

Since we no longer need to expose the OWNCLOUD_INSTALL_DIR volume, the
application can be setup on kubernetes.

1 files changed, 11 insertions, 6 deletions

diff --git a/entrypoint.sh b/entrypoint.sh
index 91a6866..47adac3 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,16 +5,20 @@ source ${OWNCLOUD_RUNTIME_DIR}/functions
 [[ $DEBUG == true ]] && set -x
 
 case ${1} in
-  app:owncloud|occ)
+  app:owncloud|app:nginx|occ)
 
     initialize_system
-    configure_owncloud
-    configure_nginx
 
     case ${1} in
       app:owncloud)
-        echo "Starting ownCloud..."
-        exec /usr/sbin/php5-fpm
+        configure_owncloud
+        echo "Starting ownCloud php5-fpm..."
+        exec $(which php5-fpm)
+        ;;
+      app:nginx)
+        configure_nginx
+        echo "Starting nginx..."
+        exec $(which nginx) -c /etc/nginx/nginx.conf -g "daemon off;"
         ;;
       occ)
         exec $@
@@ -23,7 +27,8 @@ case ${1} in
     ;;
   app:help)
     echo "Available options:"
-    echo " app:owncloud   - Starts the ownCloud server (default)"
+    echo " app:owncloud   - Starts the ownCloud php5-fpm server (default)"
+    echo " app:nginx      - Starts the nginx server"
     echo " occ            - Launch the ownCloud's command-line interface"
     echo " app:help       - Displays the help"
     echo " [command]      - Execute the specified command, eg. bash."