Merge pull request #221 from eharris/209-useFullPathForDockerOnMAC

Issue #209: Use full path for running docker commands on MAC

Author: eharris369

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MCUtil.java

@@ -27,6 +27,9 @@
  * General utils that don't belong anywhere else
  */
 public class MCUtil {
+	
+	// Provide a way for users to override the path used for running commands
+	private static final String ENV_PATH_PROPERTY = "com.ibm.microclimate.envPath";
 
 	/**
 	 * Open a dialog on top of the current active window. Can be called off the UI thread.
@@ -161,5 +164,33 @@ public static void updateApplication(MicroclimateApplication app) {
 		}
 	}
 
-
+    public static String getOSName() {
+        return (String)System.getProperty("os.name");
+    }
+    
+    public static boolean isMACOS() {
+    	String osName = getOSName();
+    	if (osName != null && osName.toLowerCase().contains("mac")) {
+    		return true;
+    	}
+    	return false;
+    }
+    
+    public static String getEnvPath() {
+    	String path = (String)System.getProperty(ENV_PATH_PROPERTY);
+    	if (path == null || path.trim().isEmpty()) {
+    		if (isMACOS()) {
+    			// On MAC a full path is required for running commands
+    			return "/usr/local/bin/";
+    		}
+    		return null;
+    	}
+    	path = path.trim();
+    	path = path.replaceAll("\\", "/");
+    	if (!path.endsWith("/")) {
+    		path = path + "/";
+    	}
+    	return path;
+    }
+    
 }

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/ContainerShellAction.java

@@ -22,6 +22,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 
 import com.ibm.microclimate.core.internal.MCLogger;
+import com.ibm.microclimate.core.internal.MCUtil;
 import com.ibm.microclimate.core.internal.MicroclimateApplication;
 import com.ibm.microclimate.core.internal.constants.ProjectType;
 
@@ -31,7 +32,7 @@
 public class ContainerShellAction implements IObjectActionDelegate {
 
 	private static final String LAUNCHER_DELEGATE_ID = "org.eclipse.tm.terminal.connector.local.launcher.local"; //$NON-NLS-1$
-
+	
     protected MicroclimateApplication app;
     protected ILauncherDelegate delegate;
 
@@ -87,10 +88,12 @@ public void run(IAction action) {
         }
 
         // Open a shell in the application container
+        String envPath = MCUtil.getEnvPath();
+        String dockerPath = envPath != null ? envPath + "docker" : "docker";
         Map<String, Object> properties = new HashMap<>();
         properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID, delegate.getId());
         properties.put(ITerminalsConnectorConstants.PROP_TITLE, app.name);
-        properties.put(ITerminalsConnectorConstants.PROP_PROCESS_PATH, "docker");
+        properties.put(ITerminalsConnectorConstants.PROP_PROCESS_PATH, dockerPath);
         properties.put(ITerminalsConnectorConstants.PROP_PROCESS_ARGS, "exec -it " + app.getContainerId() + " " + command);
         delegate.execute(properties, null);
     }