Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public void stop() {
if (removeImages != null) {
cmd += " --rmi " + removeImages.dockerRemoveImagesType();
}
this.composeDelegate.runWithCompose(this.localCompose, cmd);
this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
} finally {
this.project = this.composeDelegate.randomProjectId();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public void stop() {
if (removeImages != null) {
cmd += " --rmi " + removeImages.dockerRemoveImagesType();
}
this.composeDelegate.runWithCompose(this.localCompose, cmd);
this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
} finally {
this.project = this.composeDelegate.randomProjectId();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.testcontainers.junit;

import org.junit.Rule;
import org.testcontainers.containers.ComposeContainer;

import java.io.File;

public class ComposeContainerPortViaEnvTest extends BaseComposeTest {

@Rule
public ComposeContainer environment = new ComposeContainer(
new File("src/test/resources/v2-compose-test-port-via-env.yml")
)
.withExposedService("redis-1", REDIS_PORT)
.withEnv("REDIS_PORT", String.valueOf(REDIS_PORT));

@Override
protected ComposeContainer getEnvironment() {
return environment;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.testcontainers.junit;

import org.junit.Rule;
import org.testcontainers.containers.DockerComposeContainer;

import java.io.File;

public class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {

@Rule
public DockerComposeContainer environment = new DockerComposeContainer(
new File("src/test/resources/v2-compose-test-port-via-env.yml")
)
.withExposedService("redis_1", REDIS_PORT)
.withEnv("REDIS_PORT", String.valueOf(REDIS_PORT));

@Override
protected DockerComposeContainer getEnvironment() {
return environment;
}
}
5 changes: 5 additions & 0 deletions core/src/test/resources/v2-compose-test-port-via-env.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
services:
redis:
image: redis
ports:
- ${REDIS_PORT}