[openwhisk] branch master updated: fix: add new Windows docker.exe location (#4991)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new fb3220c  fix: add new Windows docker.exe location (#4991)
fb3220c is described below

commit fb3220c0a2f6fd5ffabc1494a2250a5ae7a22b32
Author: Shazron Abdullah <sh...@gmail.com>
AuthorDate: Wed Oct 7 22:01:47 2020 +0800

    fix: add new Windows docker.exe location (#4991)
    
    * fix: add new Windows docker.exe location
    
    See https://github.com/docker/for-win/issues/7898
    See https://github.com/adobe/aio-cli-plugin-app/issues/304
    
    * fix: scala formatting
    
    Check: `./gradlew checkScalaFmt`
    Fix: `./gradlew scalaFmt`
---
 .../org/apache/openwhisk/standalone/StandaloneDockerSupport.scala   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala b/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala
index 3a667d8..c6d3715 100644
--- a/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala
+++ b/core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala
@@ -190,7 +190,11 @@ object StandaloneDockerSupport {
     //TODO Logic duplicated from DockerClient and WindowsDockerClient for now
     val executable = loadConfig[String]("whisk.docker.executable").toOption
     val alternatives =
-      List("/usr/bin/docker", "/usr/local/bin/docker", """C:\Program Files\Docker\Docker\resources\bin\docker.exe""") ++ executable
+      List(
+        "/usr/bin/docker",
+        "/usr/local/bin/docker",
+        """C:\Program Files\Docker\Docker\resources\bin\docker.exe""",
+        """C:\Program Files\Docker\Docker\resources\docker.exe""") ++ executable
     Try {
       alternatives.find(a => Files.isExecutable(Paths.get(a))).get
     } getOrElse {