Merge pull request #636 from infosiftr/owncloud-version-2

Upgrade owncloud's docker-compose.yml to version 2

owncloud/docker-compose.yml

@@ -1,14 +1,23 @@
-# access via "http://localhost:8080" (or "http://$(docker-machine ip):8080" if using docker-machine)
+# ownCloud with MariaDB/MySQL
-# during initial setup, use "mysql" as the MySQL hostname
+#
+# Access via "http://localhost:8080" (or "http://$(docker-machine ip):8080" if using docker-machine)
+#
+# During initial ownCloud setup, select "Storage & database" --> "Configure the database" --> "MySQL/MariaDB"
+# Database user: root
+# Database password: example
+# Database name: pick any name
+# Database host: replace "localhost" with "mysql"
 
-owncloud:
+version: '2'
-  image: owncloud
-  links:
-    - db:mysql
-  ports:
-    - 8080:80
 
-db:
+services:
-  image: mariadb
+
-  environment:
+  owncloud:
-    MYSQL_ROOT_PASSWORD: example
+    image: owncloud
+    ports:
+      - 8080:80
+
+  mysql:
+    image: mariadb
+    environment:
+      MYSQL_ROOT_PASSWORD: example