Skip to content

Do not pull the tiny image for gateway detection when checks are disabled #11935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Baqirrizvidev wants to merge 1 commit into
base: main
Choose a base branch
from
+52 −25
Open

Do not pull the tiny image for gateway detection when checks are disabled #11935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 39 additions & 25 deletions core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.utility.TestcontainersConfiguration;

import java.io.File;
import java.net.URI;
Expand All @@ -17,32 +18,45 @@ public class DockerClientConfigUtils {
public static final boolean IN_A_CONTAINER = new File("/.dockerenv").exists();

@Getter(lazy = true)
private static final Optional<String> defaultGateway = Optional
.ofNullable(
DockerClientFactory
.instance()
.runInsideDocker(
cmd -> cmd.withCmd("sh", "-c", "ip route|awk '/default/ { print $3 }'"),
(client, id) -> {
try {
LogToStringContainerCallback loggingCallback = new LogToStringContainerCallback();
client
.logContainerCmd(id)
.withStdOut(true)
.withFollowStream(true)
.exec(loggingCallback)
.awaitStarted();
loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
return loggingCallback.toString();
} catch (Exception e) {
log.warn("Can't parse the default gateway IP", e);
return null;
}
}
private static final Optional<String> defaultGateway = resolveDefaultGateway();

static Optional<String> resolveDefaultGateway() {
if (TestcontainersConfiguration.getInstance().isDisableChecks()) {
log.debug("Checks are disabled, skipping default gateway detection");
return Optional.empty();
}
try {
return Optional
.ofNullable(
DockerClientFactory
.instance()
.runInsideDocker(
cmd -> cmd.withCmd("sh", "-c", "ip route|awk '/default/ { print $3 }'"),
(client, id) -> {
try {
LogToStringContainerCallback loggingCallback = new LogToStringContainerCallback();
client
.logContainerCmd(id)
.withStdOut(true)
.withFollowStream(true)
.exec(loggingCallback)
.awaitStarted();
loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
return loggingCallback.toString();
} catch (Exception e) {
log.warn("Can't parse the default gateway IP", e);
return null;
}
}
)
)
)
.map(StringUtils::trimToEmpty)
.filter(StringUtils::isNotBlank);
.map(StringUtils::trimToEmpty)
.filter(StringUtils::isNotBlank);
} catch (Exception e) {
log.warn("Can't detect the default gateway", e);
return Optional.empty();
}
}

/**
* @deprecated use {@link DockerClientProviderStrategy#getDockerHostIpAddress()}
Expand Down
13 changes: 13 additions & 0 deletions core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@
import org.assertj.core.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.utility.MockTestcontainersConfigurationExtension;
import org.testcontainers.utility.TestcontainersConfiguration;

import java.net.URI;

import static org.assertj.core.api.Assertions.assertThat;

@ExtendWith(MockTestcontainersConfigurationExtension.class)
class DockerClientConfigUtilsTest {

DockerClient client = DockerClientFactory.lazyClient();
Expand Down Expand Up @@ -61,4 +66,12 @@ void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
void getDefaultGateway() {
assertThat(DockerClientConfigUtils.getDefaultGateway()).isNotNull();
}

@Test
@Timeout(5)
void resolveDefaultGatewayShouldNotRunContainerWhenChecksAreDisabled() {
Mockito.doReturn(true).when(TestcontainersConfiguration.getInstance()).isDisableChecks();

assertThat(DockerClientConfigUtils.resolveDefaultGateway()).isEmpty();
}
}