Skip to content

Commit e2b2d85

Browse files
Fix Docker compose stop command by adding environment (#8493)
This issue was introduced in 7112db5. `DockerComposeContainer` and `ComposeContainer` now passes the env to the stop command in both implementations. Fixes #8492 --------- Signed-off-by: Michael Musenbrock <[email protected]> Co-authored-by: Eddú Meléndez Gonzales <[email protected]>
1 parent eadc9d6 commit e2b2d85

File tree

5 files changed

+49
-2
lines changed

5 files changed

+49
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public void stop() {
165165
if (removeImages != null) {
166166
cmd += " --rmi " + removeImages.dockerRemoveImagesType();
167167
}
168-
this.composeDelegate.runWithCompose(this.localCompose, cmd);
168+
this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
169169
} finally {
170170
this.project = this.composeDelegate.randomProjectId();
171171
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public void stop() {
172172
if (removeImages != null) {
173173
cmd += " --rmi " + removeImages.dockerRemoveImagesType();
174174
}
175-
this.composeDelegate.runWithCompose(this.localCompose, cmd);
175+
this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env);
176176
} finally {
177177
this.project = this.composeDelegate.randomProjectId();
178178
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.testcontainers.junit;
2+
3+
import org.junit.Rule;
4+
import org.testcontainers.containers.ComposeContainer;
5+
6+
import java.io.File;
7+
8+
public class ComposeContainerPortViaEnvTest extends BaseComposeTest {
9+
10+
@Rule
11+
public ComposeContainer environment = new ComposeContainer(
12+
new File("src/test/resources/v2-compose-test-port-via-env.yml")
13+
)
14+
.withExposedService("redis-1", REDIS_PORT)
15+
.withEnv("REDIS_PORT", String.valueOf(REDIS_PORT));
16+
17+
@Override
18+
protected ComposeContainer getEnvironment() {
19+
return environment;
20+
}
21+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.testcontainers.junit;
2+
3+
import org.junit.Rule;
4+
import org.testcontainers.containers.DockerComposeContainer;
5+
6+
import java.io.File;
7+
8+
public class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {
9+
10+
@Rule
11+
public DockerComposeContainer environment = new DockerComposeContainer(
12+
new File("src/test/resources/v2-compose-test-port-via-env.yml")
13+
)
14+
.withExposedService("redis_1", REDIS_PORT)
15+
.withEnv("REDIS_PORT", String.valueOf(REDIS_PORT));
16+
17+
@Override
18+
protected DockerComposeContainer getEnvironment() {
19+
return environment;
20+
}
21+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
redis:
3+
image: redis
4+
ports:
5+
- ${REDIS_PORT}

0 commit comments

Comments
 (0)