From 01aa82ac1cc08d6fc43f26b0511b6b2904d14b9b Mon Sep 17 00:00:00 2001
From: Kevin Xu <accoleon@gmail.com>
Date: Fri, 10 Feb 2017 21:14:00 -0800
Subject: [PATCH] Update docker-compose.yml

Switched to rancher-nfs again.
---
 .../apache-guacamole/0/docker-compose.yml     | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/templates/apache-guacamole/0/docker-compose.yml b/templates/apache-guacamole/0/docker-compose.yml
index 3e3c314..b13e320 100644
--- a/templates/apache-guacamole/0/docker-compose.yml
+++ b/templates/apache-guacamole/0/docker-compose.yml
@@ -8,31 +8,22 @@ services:
       MYSQL_PASSWORD: ${guacamole_password}
       MYSQL_RANDOM_ROOT_PASSWORD: 'true'
       MYSQL_USER: ${guacamole_user}
-    volumes_from:
-    - db-data
+    volumes:
+    - dbdata:/var/lib/mysql
+    - dbinit:/docker-entrypoint-initdb.d
     labels:
-      io.rancher.sidekicks: setup-get-db-script,db-data
+      io.rancher.sidekicks: setup-get-db-script
   setup-get-db-script:
     image: glyptodon/guacamole
     network_mode: none
-    volumes_from:
-    - db-data
+    volumes:
+    - dbinit:/docker-entrypoint-initdb.d
     command:
     - bash
     - -c
     - /opt/guacamole/bin/initdb.sh --mysql > /docker-entrypoint-initdb.d/initdb.sql
     labels:
       io.rancher.container.start_once: 'true'
-  db-data:
-    image: mariadb
-    network_mode: none
-    volumes:
-    - /var/lib/mysql
-    - /docker-entrypoint-initdb.d
-    command:
-    - /bin/echo
-    labels:
-      io.rancher.container.start_once: 'true'
   guacd:
     image: glyptodon/guacd
   guacamole:
@@ -49,4 +40,9 @@ services:
     command:
     - /bin/bash
     - -c
-    - cd /usr/local/tomcat/webapps;rm -rf ROOT/; ln -s guacamole.war ROOT.war; /opt/guacamole/bin/start.sh;
\ No newline at end of file
+    - cd /usr/local/tomcat/webapps;rm -rf ROOT/; ln -s guacamole.war ROOT.war; /opt/guacamole/bin/start.sh;
+volumes:
+  dbdata:
+    driver: rancher-nfs
+  dbinit:
+    driver: rancher-nfs