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

[rabbah]

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 6feda87  re-fix: fix: add new Windows docker.exe location (#5021)
6feda87 is described below

commit 6feda87956c0043339f59063b341d5afdeff632a
Author: Shazron Abdullah <shaz...@gmail.com>
AuthorDate: Tue Nov 3 02:01:32 2020 +0800

    re-fix: fix: add new Windows docker.exe location (#5021)
---
 .../core/containerpool/docker/StandaloneDockerContainerFactory.scala  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/docker/StandaloneDockerContainerFactory.scala
 
b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/docker/StandaloneDockerContainerFactory.scala
index 9b64642..b3102cc 100644
--- 
a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/docker/StandaloneDockerContainerFactory.scala
+++ 
b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/docker/StandaloneDockerContainerFactory.scala
@@ -100,7 +100,9 @@ trait WindowsDockerClient {
 
   override protected def executableAlternatives: List[String] = {
     val executable = loadConfig[String]("whisk.docker.executable").toOption
-    List("""C:\Program Files\Docker\Docker\resources\bin\docker.exe""") ++ 
executable
+    List(
+      """C:\Program Files\Docker\Docker\resources\bin\docker.exe""",
+      """C:\Program Files\Docker\Docker\resources\docker.exe""") ++ executable
   }
 }