automated docker-machine installation with scons and the instal.sh

christian7007 · Mar 6, 2018 · b4c9cd4 · b4c9cd4
1 parent e16d090
commit b4c9cd4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/SConstruct b/SConstruct
@@ -165,6 +165,9 @@ main_env.Append(rubygems=ARGUMENTS.get('rubygems', 'no'))
 # Sunstone minified files generation
 main_env.Append(sunstone=ARGUMENTS.get('sunstone', 'no'))
 
+# Docker-machine addon generation
+main_env.Append(dockerMachine=ARGUMENTS.get('dockerMachine', 'no'))
+
 if not main_env.GetOption('clean'):
     try:
         if mysql=='yes':
@@ -261,7 +264,7 @@ build_scripts=[
     'share/rubygems/SConstruct',
     'src/im_mad/collectd/SConstruct',
     'src/client/SConstruct',
-    'src/docker-machine/SConstruct
+    'src/docker-machine/SConstruct'
 ]
 
 for script in build_scripts:

diff --git a/src/docker-machine/SConstruct b/src/docker-machine/SConstruct
@@ -20,9 +20,9 @@ import os
 
 Import('env')
 
-if env['docker-machine']=='yes':
+if env['dockerMachine']=='yes':
     print "Generating docker-machine-driver-opennebula\n"
-    exit_code=os.system("./generate")
+    exit_code=os.system("./generate.sh")
 
     if exit_code != 0:
         print "Error generating docker-machine-driver-opennebula\n"