From 6a6f1f53452feacd595f67c938b51bf49666e41d Mon Sep 17 00:00:00 2001
From: Ariel Elkin <arielelkin@gmail.com>
Date: Sun, 26 Jun 2016 17:33:16 +0200
Subject: [PATCH 1/2] Clarify setup steps in owncloud docker-compose.yml

---
 owncloud/docker-compose.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/owncloud/docker-compose.yml b/owncloud/docker-compose.yml
index 39fbdb00e..a245dfe8f 100644
--- a/owncloud/docker-compose.yml
+++ b/owncloud/docker-compose.yml
@@ -1,14 +1,21 @@
-# access via "http://localhost:8080" (or "http://$(docker-machine ip):8080" if using docker-machine)
-# during initial setup, use "mysql" as the MySQL hostname
+# ownCloud with MariaDB
+#
+# 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: my-database-password
+# Database name: pick any name
+# Database host: replace "localhost" with owncloud_db 
 
 owncloud:
-  image: owncloud
+  image: owncloud:9
   links:
-    - db:mysql
+    - owncloud_db
   ports:
     - 8080:80
 
-db:
+owncloud_db:
   image: mariadb
   environment:
-    MYSQL_ROOT_PASSWORD: example
+    MYSQL_ROOT_PASSWORD: my-database-password

From a63819284471a794e3d0a62cba871af9d545ebdf Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 6 Jul 2016 22:31:37 -0700
Subject: [PATCH 2/2] Upgrade owncloud's docker-compose.yml to version 2

---
 owncloud/docker-compose.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/owncloud/docker-compose.yml b/owncloud/docker-compose.yml
index a245dfe8f..9d827f349 100644
--- a/owncloud/docker-compose.yml
+++ b/owncloud/docker-compose.yml
@@ -1,21 +1,23 @@
-# ownCloud with MariaDB
+# ownCloud with MariaDB/MySQL
 #
 # 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: my-database-password
+# Database password: example
 # Database name: pick any name
-# Database host: replace "localhost" with owncloud_db 
+# Database host: replace "localhost" with "mysql"
 
-owncloud:
-  image: owncloud:9
-  links:
-    - owncloud_db
-  ports:
-    - 8080:80
+version: '2'
 
-owncloud_db:
-  image: mariadb
-  environment:
-    MYSQL_ROOT_PASSWORD: my-database-password
+services:
+
+  owncloud:
+    image: owncloud
+    ports:
+      - 8080:80
+
+  mysql:
+    image: mariadb
+    environment:
+      MYSQL_ROOT_PASSWORD: example