Skip to content

Commit dcdc081

Browse files
committed
Uses official ollama testcontainers
1 parent c6c183b commit dcdc081

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

langchain4j-ollama-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
<dependency>
6161
<groupId>org.testcontainers</groupId>
62-
<artifactId>testcontainers</artifactId>
62+
<artifactId>ollama</artifactId>
6363
<scope>test</scope>
6464
</dependency>
6565

langchain4j-ollama-spring-boot-starter/src/test/java/dev/langchain4j/ollama/spring/AutoConfigIT.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
import org.junit.jupiter.api.Test;
1313
import org.springframework.boot.autoconfigure.AutoConfigurations;
1414
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
15-
import org.testcontainers.containers.GenericContainer;
1615
import org.testcontainers.junit.jupiter.Container;
1716
import org.testcontainers.junit.jupiter.Testcontainers;
17+
import org.testcontainers.ollama.OllamaContainer;
18+
import org.testcontainers.utility.DockerImageName;
1819

1920
import java.util.concurrent.CompletableFuture;
2021

21-
import static java.lang.String.format;
2222
import static java.util.concurrent.TimeUnit.SECONDS;
2323
import static org.assertj.core.api.Assertions.assertThat;
2424

@@ -28,14 +28,17 @@ class AutoConfigIT {
2828
private static final String MODEL_NAME = "phi";
2929

3030
@Container
31-
static GenericContainer<?> ollama = new GenericContainer<>("langchain4j/ollama-" + MODEL_NAME)
31+
static OllamaContainer ollama = new OllamaContainer(
32+
DockerImageName.parse("langchain4j/ollama-" + MODEL_NAME)
33+
.asCompatibleSubstituteFor("ollama/ollama")
34+
)
3235
.withExposedPorts(11434);
3336

3437
ApplicationContextRunner contextRunner = new ApplicationContextRunner()
3538
.withConfiguration(AutoConfigurations.of(AutoConfig.class));
3639

3740
private static String baseUrl() {
38-
return format("http://%s:%s", ollama.getHost(), ollama.getFirstMappedPort());
41+
return ollama.getEndpoint();
3942
}
4043

4144
@Test

0 commit comments

Comments
 (0)