Skip to content

Commit 464637c

Browse files
authored
add new path to possible docker exe locations in Windows (#25)
1 parent 16ac544 commit 464637c

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ You can configure the Docker behaviour using the `@LocalstackDockerProperties` a
7777

7878
For more details, please refer to the README of the main LocalStack repo: https://github.com/localstack/localstack
7979

80+
> **_NOTE:_** These utilities assume docker is installed in one of the default locations (`C:\program files\docker\docker\resources\bin\docker.exe`,
81+
`C:\program files\docker\docker\resources\docker.exe`, `usr/local/bin/docker` or `usr/bin/docker`). If your docker executable is in a
82+
different location, then use the `DOCKER_LOCATION` environment variable to specify it.
83+
8084
### Deprecated Configurations
8185

8286
Due to recent changes in LocalStack (e.g., exposing all services via a single edge port, `4566`), the following configuration parameters are now deprecated in the latest version:

src/main/java/cloud/localstack/LocalstackTestRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
* and then terminates when tests are complete.
1212
*
1313
* Having docker installed is a prerequisite for this test runner to execute. If docker
14-
* is not installed in one of the default locations (C:\program files\docker\docker\resources\bin\, usr/local/bin or
15-
* usr/bin)
14+
* is not installed in one of the default locations (C:\program files\docker\docker\resources\bin\docker.exe,
15+
* C:\program files\docker\docker\resources\docker.exe, usr/local/bin/docker or usr/bin/docker)
1616
* then use the DOCKER_LOCATION environment variable to specify the location.
1717
*
1818
* Since ports are dynamically allocated, the external port needs to be resolved based on the default localstack port.

src/main/java/cloud/localstack/docker/DockerExe.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class DockerExe {
2626
private static final List<String> POSSIBLE_EXE_LOCATIONS = Arrays.asList(
2727
System.getenv("DOCKER_LOCATION"),
2828
"C:/program files/docker/docker/resources/bin/docker.exe",
29+
"C:/program files/docker/docker/resources/docker.exe",
2930
"/usr/local/bin/docker",
3031
"/usr/bin/docker");
3132

src/main/java/cloud/localstack/docker/LocalstackDockerExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
* and then terminates when tests are complete.
1212
*
1313
* Having docker installed is a prerequisite for this test runner to execute. If docker
14-
* is not installed in one of the default locations (C:\program files\docker\docker\resources\bin\, usr/local/bin or
15-
* usr/bin)
14+
* is not installed in one of the default locations (C:\program files\docker\docker\resources\bin\docker.exe,
15+
* C:\program files\docker\docker\resources\docker.exe, usr/local/bin/docker or usr/bin/docker)
1616
* then use the DOCKER_LOCATION environment variable to specify the location.
1717
*
1818
* Since ports are dynamically allocated, the external port needs to be resolved based on the default localstack port.

0 commit comments

Comments
 (0)