Fix for missing override compose files

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

@@ -48,9 +48,11 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static org.testcontainers.containers.BindMode.READ_ONLY;
 import static org.testcontainers.containers.BindMode.READ_WRITE;
+import static org.testcontainers.containers.ContainerisedDockerCompose.UNIX_PATH_SEPERATOR;
 
 /**
  * Container which launches Docker Compose, for the purposes of launching a defined set of containers.
@@ -623,9 +625,16 @@ public void invoke() {
         final Map<String, String> environment = Maps.newHashMap(env);
         environment.put(ENV_PROJECT_NAME, identifier);
 
-        final File dockerComposeBaseFile = composeFiles.get(0);
-        final File pwd = dockerComposeBaseFile.getAbsoluteFile().getParentFile().getAbsoluteFile();
-        environment.put(ENV_COMPOSE_FILE, new File(pwd, dockerComposeBaseFile.getAbsoluteFile().getName()).getAbsolutePath());
+
+        final List<String> absoluteDockerComposeFiles = composeFiles.stream()
+            .map(File::getAbsolutePath)
+            .map(MountableFile::forHostPath)
+            .map(MountableFile::getFilesystemPath)
+            .collect(toList());
+        final String composeFileEnvVariableValue = absoluteDockerComposeFiles.stream().collect(joining(UNIX_PATH_SEPERATOR + "")); // we always need the UNIX path separator
+        logger().debug("Set env COMPOSE_FILE={}", composeFileEnvVariableValue);
+        final File pwd = composeFiles.get(0).getAbsoluteFile().getParentFile().getAbsoluteFile();
+        environment.put(ENV_COMPOSE_FILE, composeFileEnvVariableValue);
 
         logger().info("Local Docker Compose is running command: {}", cmd);
 

core/src/test/java/org/testcontainers/junit/DockerComposeLocalOverrideTest.java

@@ -0,0 +1,70 @@
+package org.testcontainers.junit;
+
+import com.google.common.util.concurrent.Uninterruptibles;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.rnorth.ducttape.unreliables.Unreliables;
+import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.utility.TestEnvironment;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.net.Socket;
+import java.util.concurrent.TimeUnit;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.info;
+import static org.rnorth.visibleassertions.VisibleAssertions.pass;
+import static org.testcontainers.junit.DockerComposeDoNotOverrideTest.DOCKER_COMPOSE_OVERRIDE_TEST_BASE_YML;
+import static org.testcontainers.junit.DockerComposeDoNotOverrideTest.DOCKER_COMPOSE_OVERRIDE_TEST_OVERRIDE_ENV;
+import static org.testcontainers.junit.DockerComposeDoNotOverrideTest.DOCKER_COMPOSE_OVERRIDE_TEST_OVERRIDE_YML;
+
+/**
+ * Created by rnorth on 11/06/2016.
+ */
+public class DockerComposeLocalOverrideTest {
+
+    private static final int SERVICE_PORT = 3000;
+    private static final String SERVICE_NAME = "alpine_1";
+
+    @Rule
+    public DockerComposeContainer compose =
+            new DockerComposeContainer(
+                    new File(DOCKER_COMPOSE_OVERRIDE_TEST_BASE_YML),
+                    new File(DOCKER_COMPOSE_OVERRIDE_TEST_OVERRIDE_YML))
+                    .withExposedService(SERVICE_NAME, SERVICE_PORT)
+                    .withLocalCompose(true);
+
+    @BeforeClass
+    public static void checkVersion() {
+        Assume.assumeTrue(TestEnvironment.dockerApiAtLeast("1.22"));
+    }
+
+    @Test(timeout = 30_000)
+    public void testEnvVar() {
+        BufferedReader reader = Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, () -> {
+            Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+
+            Socket socket = new Socket(
+                compose.getServiceHost(SERVICE_NAME, SERVICE_PORT),
+                compose.getServicePort(SERVICE_NAME, SERVICE_PORT));
+            return new BufferedReader(new InputStreamReader(socket.getInputStream()));
+        });
+
+        Unreliables.retryUntilTrue(10, TimeUnit.SECONDS, () -> {
+            while (reader.ready()) {
+                String line = reader.readLine();
+                if (line.contains(DOCKER_COMPOSE_OVERRIDE_TEST_OVERRIDE_ENV)) {
+                    pass("Mapped environment variable was found");
+                    return true;
+                }
+            }
+            info("Mapped environment variable was not found yet - process probably not ready");
+            Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+            return false;
+        });
+
+    }
+}

core/src/test/java/org/testcontainers/junit/DockerComposeOverrideTest.java

@@ -39,7 +39,7 @@ public static void checkVersion() {
 
 
     @Test(timeout = 30_000)
-    public void testEnvVar() throws IOException {
+    public void testEnvVar() {
         BufferedReader br = Unreliables.retryUntilSuccess(10, TimeUnit.SECONDS, () -> {
             Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);