Merge branch 'master' into updateOwncloud911

Conflicts:
	Dockerfile
	rootfs/app-entrypoint.sh

bitnami/owncloud/Dockerfile

@@ -23,4 +23,4 @@ EXPOSE 80 443
 
 ENTRYPOINT ["/app-entrypoint.sh"]
 
-CMD ["harpoon", "start", "--foreground", "apache"]
+CMD ["nami", "start", "--foreground", "apache"]

bitnami/owncloud/README.md

@@ -1,3 +1,5 @@
+[![Docker Hub Automated Build](http://container.checkforupdates.com/badges/bitnami/owncloud)](https://hub.docker.com/r/bitnami/owncloud/)
+
 # What is ownCloud?
 
 ownCloud is a file sharing server that puts the control and security of your own data back into your hands.

bitnami/owncloud/docker-compose.yml

@@ -15,6 +15,8 @@ services:
       - 'php_data:/bitnami/php'
     depends_on:
       - mariadb
+    environment:
+      - OWNCLOUD_HOST=localhost
 volumes:
   mariadb_data:
     driver: local

bitnami/owncloud/rootfs/app-entrypoint.sh

@@ -3,14 +3,14 @@ set -e
 
 function initialize {
     # Package can be "installed" or "unpacked"
-    status=`harpoon inspect $1`
+    status=`nami inspect $1`
     if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
         # Clean up inputs
         inputs=""
         if [[ -f /$1-inputs.json ]]; then
             inputs=--inputs-file=/$1-inputs.json
         fi
-        harpoon initialize $1 $inputs
+        nami initialize $1 $inputs
     fi
 }
 
@@ -26,8 +26,8 @@ export MARIADB_PORT=${MARIADB_PORT:-"3306"}
 
 
 
-if [[ "$1" == "harpoon" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
-   for module in php apache owncloud; do
+   for module in apache php owncloud; do
     initialize $module
    done
    echo "Starting application ..."