From 0e69a5d65a27968df659d6633e8a5f49103eeea3 Mon Sep 17 00:00:00 2001
From: Ronny Abraham <ronny.coder @gmail.com>
Date: Sun, 2 Jun 2019 15:07:45 +0300
Subject: [PATCH] add machine name to docker

---
 modules/docker.py     | 16 +++++++++++++---
 modules/initialize.py | 11 ++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/modules/docker.py b/modules/docker.py
index e64f277..269fa59 100644
--- a/modules/docker.py
+++ b/modules/docker.py
@@ -13,17 +13,27 @@ def docker_ip():
     configuration = env.config
 
     if configuration.docker.database.host == 'local':
-        docker_cmd = 'docker-machine ip default'
+        docker_cmd = 'docker-machine ip %s' % \
+            configuration.docker.machine
+
         return run(docker_cmd)
+
     else:
         return configuration.docker.database.host
 
 
 def docker_run(cmd):
     from fabric.context_managers import prefix
+    configuration = env.config
 
-    docker_eval = "eval $(docker-machine env default)"
-    with prefix(docker_eval):
+    if configuration.docker.machine:
+        docker_eval = "eval $(docker-machine env %s)" % \
+            configuration.docker.machine
+
+        with prefix(docker_eval):
+            run(cmd)
+
+    else:
         run(cmd)
 
 
diff --git a/modules/initialize.py b/modules/initialize.py
index 16eb3af..29753fd 100644
--- a/modules/initialize.py
+++ b/modules/initialize.py
@@ -863,7 +863,7 @@ def _init_docker(configuration, layout, config):
             project_branch=configuration.project.branch)
 
         if 'name' in config['docker'] and config['docker']['name']:
-            configuration.docker.name = config['docker']['name']
+                configuration.docker.name = config['docker']['name']
 
         #
         # host information
@@ -871,6 +871,15 @@ def _init_docker(configuration, layout, config):
         if 'host' in config['docker']:
             configuration.docker.host = config['docker']['host']
 
+        #
+        # get machine name for docker-machine if exists
+
+        configuration.docker.machine = None
+
+        if 'machine' in config['docker']:
+            configuration.docker.machine = config['docker']['machine']
+
+        #
         #
         # configuration info for docker database