From 24f008bc170dc56e489d4939a450032282d5a4cf Mon Sep 17 00:00:00 2001
From: disaster <linuxworkgroup@hotmail.com>
Date: Wed, 26 Apr 2017 09:29:59 +0000
Subject: [PATCH] Fix bug when choose to use local mount path to store
 persistant data

---
 templates/minio/0/docker-compose.yml.tpl | 8 ++++----
 templates/minio/0/rancher-compose.yml    | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/templates/minio/0/docker-compose.yml.tpl b/templates/minio/0/docker-compose.yml.tpl
index a567ca6..7bce3f8 100644
--- a/templates/minio/0/docker-compose.yml.tpl
+++ b/templates/minio/0/docker-compose.yml.tpl
@@ -5,9 +5,9 @@ services:
     image: webcenter/alpine-minio:2017-03-16_4
     volumes:
       - minio-scheduler-setting:/opt/scheduler
-    {{- if contains .Values.VOLUME_DRIVER "/" }}
+    {{- if eq (printf "%.1s" .Values.VOLUME_DRIVER) "/" }}
       {{- range $idx, $e := atoi .Values.MINIO_DISKS | until }}
-      - {{.Values.VOLUME_DRIVER}}/{{.Values.DISK_BASE_NAME}}{{$idx}}:/data/disk{{$idx}}
+      - ${VOLUME_DRIVER}/${DISK_BASE_NAME}{{$idx}}:/data/disk{{$idx}}
       {{- end}}
     {{- else}}
        {{- range $idx, $e := atoi .Values.MINIO_DISKS | until }}
@@ -61,10 +61,10 @@ volumes:
   minio-scheduler-setting:
     driver: local
     per_container: true
-  {{- if not (contains .Values.VOLUME_DRIVER "/")}}
+  {{- if ne (printf "%.1s" .Values.VOLUME_DRIVER) "/" }}
     {{- range $idx, $e := atoi .Values.MINIO_DISKS | until }}
   minio-data-{{$idx}}:
     per_container: true
     driver: ${VOLUME_DRIVER}
     {{- end}}
-  {{- end}}
+  {{- end}}
\ No newline at end of file
diff --git a/templates/minio/0/rancher-compose.yml b/templates/minio/0/rancher-compose.yml
index e571ea1..8363018 100644
--- a/templates/minio/0/rancher-compose.yml
+++ b/templates/minio/0/rancher-compose.yml
@@ -2,7 +2,6 @@ version: '2'
 catalog:
   name: Minio
   version: 2017-03-16-rancher1
-  minimum_rancher_version: v1.5.0
   questions:
     - variable: "MINIO_SCALE"
       description: "Number of minio nodes."
@@ -111,4 +110,4 @@ services:
       healthy_threshold: 2
       port: 42
       unhealthy_threshold: 3
-      interval: 2000
+      interval: 2000
\ No newline at end of file