Merge pull request #2 from apocas/main

updates

Author: nunokisc

lib/services.js

@@ -83,8 +83,14 @@ module.exports = async function (docker, projectName, recipe, output) {
     if (service.volumes) {
       opts['Volumes'] = {};
       for (var volume of service.volumes) {
-        var v = volume.split(':');
-        opts['Volumes'][v[1]] = {};
+        if (typeof volume === 'string' || volume instanceof String) {
+          var v = volume.split(':');
+          opts['Volumes'][v[1]] = {};
+        } else {
+          if (volume.target) {
+            opts['Volumes'][volume.target] = {};
+          }
+        }
       }
     }
 
@@ -122,7 +128,29 @@ var buildHostConfig = function (service) {
   };
 
   if (service.volumes) {
-    output['Binds'] = service.volumes;
+    output['Binds'] = [];
+
+    for (var volume of service.volumes) {
+      if (typeof volume === 'string' || volume instanceof String) {
+        output['Binds'].push(volume);
+      } else {
+        var volumestr = '';
+        if (volume.source && volume.target) {
+          volumestr += volume.source + ':' + volume.target + ':';
+        }
+        if (volume.read_only) {
+          volumestr += 'ro,';
+        }
+        if (volume.volume && volume.volume.nocopy) {
+          volumestr += 'nocopy,';
+        }
+        if (volume.bind && volume.bind.propagation) {
+          volumestr += volume.bind.propagation + ',';
+        }
+        volumestr = volumestr.slice(0, -1);
+        output['Binds'].push(volumestr);
+      }
+    }
   }
 
   if (service.ports && service.ports.length > 0) {

test/assets/wordpress_long.yml

@@ -0,0 +1,29 @@
+version: "3.9"
+    
+services:
+  db:
+    image: mysql:5.7
+    volumes:
+      - source: db_data
+        target: /var/lib/mysql
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: somewordpress
+      MYSQL_DATABASE: wordpress
+      MYSQL_USER: wordpress
+      MYSQL_PASSWORD: wordpress
+    
+  wordpress:
+    depends_on:
+      - db
+    image: wordpress:latest
+    ports:
+      - "8000:80"
+    restart: always
+    environment:
+      WORDPRESS_DB_HOST: db:3306
+      WORDPRESS_DB_USER: wordpress
+      WORDPRESS_DB_PASSWORD: wordpress
+      WORDPRESS_DB_NAME: wordpress
+volumes:
+  db_data: {}