From 503bcb55d79ca6900e49ff6db63244c56ba682c0 Mon Sep 17 00:00:00 2001
From: Benoit Moussaud <bmoussaud@xebialabs.com>
Date: Tue, 15 Mar 2016 14:20:00 +0100
Subject: [PATCH] manage mode on volumes

---
 src/main/resources/docker/docker-create.sh.ftl | 4 ++--
 src/main/resources/synthetic.xml               | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/docker/docker-create.sh.ftl b/src/main/resources/docker/docker-create.sh.ftl
index 2323166..bafa730 100644
--- a/src/main/resources/docker/docker-create.sh.ftl
+++ b/src/main/resources/docker/docker-create.sh.ftl
@@ -11,7 +11,7 @@ echo "Running ${deployed_container.id}"
 <#assign cmdLine = ["docker", "create"] />
 
 <#if (deployed_container.publishAllExposedPorts)>
-    <#assign cmdLine = cmdLine + ["-P"]/>
+    <#assign cmdLine = cmdLine + ["--publish-all"]/>
 </#if>
 <#if (deployed_container.restartAlways)>
     <#assign cmdLine = cmdLine + ["--restart=always"]/>
@@ -33,7 +33,7 @@ echo "Running ${deployed_container.id}"
     <#assign cmdLine = cmdLine + ["--link=${link.name}:${link.alias}"]/>
 </#list>
 <#list deployed_container.volumes as volume>
-    <#assign cmdLine = cmdLine + ["-v ${volume.source}:${volume.destination}"]/>
+    <#assign cmdLine = cmdLine + ["--volume=${volume.source}:${volume.destination}:${volume.mode}"]/>
 </#list>
 <#list deployed_container.volumesFrom as volume>
     <#assign cmdLine = cmdLine + ["--volumes-from=${volume}"]/>
diff --git a/src/main/resources/synthetic.xml b/src/main/resources/synthetic.xml
index 4e0c55f..34542d1 100644
--- a/src/main/resources/synthetic.xml
+++ b/src/main/resources/synthetic.xml
@@ -68,6 +68,10 @@
         <generate-deployable type="docker.VolumeSpec" extends="udm.BaseEmbeddedDeployable"/>
         <property name="source" description="location on the host"/>
         <property name="destination" description="location inside the container"/>
+        <property name="mode" default="rw" description="mount mode rw/ro">
+            <rule type="regex" pattern="rw|ro"
+                  message="Mode can be either 'rw' or 'ro'. "/>
+        </property>
     </type>
 
     <type type="docker.Link" deployable-type="docker.LinkSpec" container-type="docker.RunContainer" extends="udm.BaseEmbeddedDeployed">
@@ -190,7 +194,7 @@
                   description="Specify labels for the created engine key=value"/>
         <property name="machineName" required="false" category="Provisioning"/>
         <property name="environmentId" required="false" category="Provisioning"/>
-        <property name="containerTags" required="false" kind="set_of_string" category="Provisioning" description="Deployment tags on the created ci" />
+        <property name="containerTags" required="false" kind="set_of_string" category="Provisioning" description="Deployment tags on the created ci"/>
     </type>
 
     <type type="docker.DeployedSwarmMachine" extends="udm.BaseDeployed" container-type="overthere.Host" deployable-type="docker.SwarmMachineSpec">
@@ -208,7 +212,7 @@
                   description="Specify labels for the created engine key=value" category="Engine"/>
         <property name="machineName" required="false" category="Provisioning"/>
         <property name="environmentId" required="false" category="Provisioning"/>
-        <property name="containerTags" required="false" kind="set_of_string" category="Provisioning" description="Deployment tags on the created ci" />
+        <property name="containerTags" required="false" kind="set_of_string" category="Provisioning" description="Deployment tags on the created ci"/>
     </type>
     <!-- /Provisioning -->