Fix docker-compose executable check for Win10 (#460) #461

bsnisar · 2017-09-21T09:01:57Z

This is fix for issue: #460

kiview · 2017-09-21T11:08:01Z

Do we run tests for local compose on Windows? I have to check at home on my Windows box.

I also wonder how https://github.com/bsnisar/testcontainers-java/blob/61d9b0e1972a8be0530d22368ee9ff200172ca6d/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java#L512 works, if we have to append .exe on Windows.

kiview

I think I would prefer to make the value of COMPOSE_EXECUTABLE OS dependent, if that's what we also need when calling the docker-compose executable.

kiview · 2017-09-21T11:06:43Z

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

@@ -530,6 +531,17 @@ public void invoke() {
        }
    }

+    // #460 : docker-compose are not resolvable on Win10 machines because there is docker-compose.exe binary,


I think we can omit this comment (or change it to correct Javadoc comment syntax, but I prefer omitting it).

kiview · 2017-09-21T11:09:20Z

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

@@ -530,6 +531,17 @@ public void invoke() {
        }
    }

+    // #460 : docker-compose are not resolvable on Win10 machines because there is docker-compose.exe binary,
+    // but not docker-compose
+    private boolean isDockerComposeExists() {


I would prefer renaming the method to something like dockerComposeExecutableExists.

bsnisar · 2017-09-21T12:26:30Z

Hi @kiview , in my case for Win10 docker-compose is accessible locally on my cmd:

But during the check inside CommandLine(executable = "docker-compose"):

    for (String pathString : getSystemPath()) {
        Path path = Paths.get(pathString);
        if (Files.exists(path.resolve(executable)) && Files.isExecutable(path.resolve(executable))) {
            return true;
        }
    }

this loop will find (among other locations) somthing like C:\Program Files\Docker\Docker\Resources\bin where no docker-compose file:

C:\Program Files\Docker\Docker\resources\bin>dir
Volume in drive C is Windows
Volume Serial Number is 8408-CF1E

Directory of C:\Program Files\Docker\Docker\resources\bin

09/10/2017 12:51 PM

.
09/10/2017 12:51 PM ..
09/10/2017 12:51 PM 6,380,236 docker-compose.exe
09/10/2017 12:51 PM 2,436,096 docker-credential-wincred.exe
09/10/2017 12:51 PM 26,885,120 docker-machine.exe
09/10/2017 12:51 PM 19,135,488 docker.exe
09/10/2017 12:51 PM 8,162,816 notary.exe

As a result even if the command is executable, run will be failed by

    if (!CommandLine.executableExists(COMPOSE_EXECUTABLE)) {
        throw new ContainerLaunchException("Local Docker Compose not found. Is " + COMPOSE_EXECUTABLE + " on the PATH?");
    }

So, for me simple fix for executable check looks good enough to satisfy this case.

kiview · 2017-09-21T12:31:08Z

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

@@ -530,6 +531,17 @@ public void invoke() {
        }
    }

+    // #460 : docker-compose are not resolvable on Win10 machines because there is docker-compose.exe binary,
+    // but not docker-compose
+    private boolean isDockerComposeExists() {


What if we change this method to:

if (SystemUtils.IS_OS_WINDOWS) { return CommandLine.executableExists(COMPOSE_EXECUTABLE + ".exe"); } else { return CommandLine.executableExists(COMPOSE_EXECUTABLE); }

This variant more readable and looks better, but narrows all possible options to *.exe variant on Win machines.
How docker-compose executable looks on other Win platforms (not Win10) ?

Since we currently only support Docker for Windows on Windows 10 (see Windows support), I would be fine with this.

In this case I will rewrite it.

Also, what about this variant:

return SystemUtils.IS_OS_WINDOWS ? CommandLine.executableExists(COMPOSE_EXECUTABLE + ".exe") : CommandLine.executableExists(COMPOSE_EXECUTABLE);

…ts (testcontainers#460)

kiview · 2017-09-21T13:50:46Z

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

@@ -530,6 +531,17 @@ public void invoke() {
        }
    }

+    // #460 : docker-compose are not resolvable on Win10 machines because there is docker-compose.exe binary,
+    // but not docker-compose
+    private boolean isDockerComposeExists() {


Since we currently only support Docker for Windows on Windows 10 (see Windows support), I would be fine with this.

…ents (testcontainers#460)

kiview · 2017-09-26T16:08:58Z

@bsnisar Can you please also update the CHANGELOG.md file, by referencing #460 in the line about the docker-compose fix? I'll merge afterwards.

bsnisar · 2017-09-27T06:44:18Z

@kiview I have updated it.
Also, as I can see there is a fix for similar problem that was merged. Is it reasonable to merge this PR after that?

kiview · 2017-09-27T09:06:26Z

CHANGELOG.md

@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.

 ## UNRELEASED
 ### Fixed
- Fixed local Docker Compose executable name resolution on Windows (#416)


What I meant, was referencing both issues here ;)

bsnisar · 2017-09-28T12:22:24Z

@kiview Ouh, its my misstate. I have just fixed it.

ahrytsiuk · 2017-10-06T11:31:29Z

@bsnisar @kiview Seems the issue is still remains.
Because on Windows OS the .exe suffix is appended twice to COMPOSE_EXECUTABLE.
First time here:

testcontainers-java/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

Line 468 in 540f567

    
           private static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker-compose.exe" : "docker-compose";

private static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker-compose.exe" : "docker-compose";

And second time here:

testcontainers-java/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

Line 536 in 540f567

return CommandLine.executableExists(COMPOSE_EXECUTABLE + ".exe");

private boolean dockerComposeExecutableExists() {
        if (SystemUtils.IS_OS_WINDOWS) {
            return CommandLine.executableExists(COMPOSE_EXECUTABLE + ".exe");
        } else {
            return CommandLine.executableExists(COMPOSE_EXECUTABLE);
        }
}

UPD:
As I understood, when you merged this PR it just broke docker-compose on Windows OS

Fix docker-compose executable check for Win10 (testcontainers#460)

61d9b0e

kiview requested changes Sep 21, 2017

View reviewed changes

Fix docker-compose executable check: renaming regarding review commen…

df95e7b

…ts (testcontainers#460)

kiview requested a review from rnorth September 21, 2017 12:31

kiview requested changes Sep 21, 2017

View reviewed changes

Fix docker-compose executable check: refactoring based on review comm…

98781e4

…ents (testcontainers#460)

kiview approved these changes Sep 26, 2017

View reviewed changes

kiview requested a review from bsideup September 26, 2017 13:54

bsideup approved these changes Sep 26, 2017

View reviewed changes

bogdan added 2 commits September 27, 2017 09:38

Merge branch 'master' into issue-460-win10-docker-compose

cc87206

Update CHANGELOG.md about testcontainers#460 issue

861e0e7

kiview requested changes Sep 27, 2017

View reviewed changes

Next update CHANGELOG.md about testcontainers#460 issue

3e4720c

Update CHANGELOG.md

ede99d4

kiview mentioned this pull request Sep 29, 2017

DockerComposeContainer doesn't seem to work #439

Closed

kiview approved these changes Sep 29, 2017

View reviewed changes

kiview merged commit 540f567 into testcontainers:master Sep 29, 2017

barrycommins mentioned this pull request Oct 18, 2017

Fixed regression in 1.4.3 when using Docker Compose on Windows, Fixes #439 #474

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix docker-compose executable check for Win10 (#460) #461

Fix docker-compose executable check for Win10 (#460) #461

bsnisar commented Sep 21, 2017 •

edited

Loading

kiview commented Sep 21, 2017 •

edited

Loading

kiview left a comment

kiview Sep 21, 2017

bsnisar Sep 21, 2017

kiview Sep 21, 2017

bsnisar commented Sep 21, 2017 •

edited

Loading

kiview Sep 21, 2017

bsnisar Sep 21, 2017 •

edited

Loading

kiview Sep 21, 2017

bsnisar Sep 22, 2017 •

edited

Loading

kiview Sep 21, 2017

kiview commented Sep 26, 2017

bsnisar commented Sep 27, 2017

kiview Sep 27, 2017

bsnisar commented Sep 28, 2017 •

edited

Loading

ahrytsiuk commented Oct 6, 2017 •

edited

Loading

Fix docker-compose executable check for Win10 (#460) #461

Fix docker-compose executable check for Win10 (#460) #461

Conversation

bsnisar commented Sep 21, 2017 • edited Loading

kiview commented Sep 21, 2017 • edited Loading

kiview left a comment

Choose a reason for hiding this comment

kiview Sep 21, 2017

Choose a reason for hiding this comment

bsnisar Sep 21, 2017

Choose a reason for hiding this comment

kiview Sep 21, 2017

Choose a reason for hiding this comment

bsnisar commented Sep 21, 2017 • edited Loading

kiview Sep 21, 2017

Choose a reason for hiding this comment

bsnisar Sep 21, 2017 • edited Loading

Choose a reason for hiding this comment

kiview Sep 21, 2017

Choose a reason for hiding this comment

bsnisar Sep 22, 2017 • edited Loading

Choose a reason for hiding this comment

kiview Sep 21, 2017

Choose a reason for hiding this comment

kiview commented Sep 26, 2017

bsnisar commented Sep 27, 2017

kiview Sep 27, 2017

Choose a reason for hiding this comment

bsnisar commented Sep 28, 2017 • edited Loading

ahrytsiuk commented Oct 6, 2017 • edited Loading

bsnisar commented Sep 21, 2017 •

edited

Loading

kiview commented Sep 21, 2017 •

edited

Loading

bsnisar commented Sep 21, 2017 •

edited

Loading

bsnisar Sep 21, 2017 •

edited

Loading

bsnisar Sep 22, 2017 •

edited

Loading

bsnisar commented Sep 28, 2017 •

edited

Loading

ahrytsiuk commented Oct 6, 2017 •

edited

Loading