Skip to content

Commit 9fe1915

Browse files
schaudermp911de
authored andcommitted
Switch to Testcontainers Oracle Free.
Also moving to the `faststart` label, hoping it will start less slow. Closes #1665 Original pull request: #1668
1 parent 082b744 commit 9fe1915

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

spring-data-jdbc/pom.xml

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

252252
<dependency>
253253
<groupId>org.testcontainers</groupId>
254-
<artifactId>oracle-xe</artifactId>
254+
<artifactId>oracle-free</artifactId>
255255
<scope>test</scope>
256256
</dependency>
257257

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/OracleDataSourceConfiguration.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import org.springframework.jdbc.core.JdbcTemplate;
2525
import org.springframework.jdbc.datasource.DriverManagerDataSource;
2626
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
27-
import org.testcontainers.containers.OracleContainer;
27+
import org.testcontainers.oracle.OracleContainer;
28+
import org.testcontainers.utility.DockerImageName;
2829

2930
/**
3031
* {@link DataSource} setup for Oracle Database XE. Starts a docker container with an Oracle database.
@@ -50,7 +51,9 @@ protected DataSource createDataSource() {
5051
if (ORACLE_CONTAINER == null) {
5152

5253
LOG.info("Oracle starting...");
53-
OracleContainer container = new OracleContainer("gvenzl/oracle-xe:21.3.0-slim").withReuse(true);
54+
DockerImageName dockerImageName = DockerImageName.parse("gvenzl/oracle-free:23.3-slim-faststart");
55+
OracleContainer container = new OracleContainer(dockerImageName)
56+
.withReuse(true);
5457
container.start();
5558
LOG.info("Oracle started");
5659

spring-data-r2dbc/pom.xml

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

311311
<dependency>
312312
<groupId>org.testcontainers</groupId>
313-
<artifactId>oracle-xe</artifactId>
313+
<artifactId>oracle-free</artifactId>
314314
<scope>test</scope>
315315
</dependency>
316316

spring-data-r2dbc/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.jdbc.core.JdbcTemplate;
3030
import org.springframework.jdbc.datasource.DriverManagerDataSource;
3131
import org.springframework.util.ClassUtils;
32-
import org.testcontainers.containers.OracleContainer;
32+
import org.testcontainers.oracle.OracleContainer;
3333

3434
/**
3535
* Utility class for testing against Oracle.
@@ -128,7 +128,7 @@ private static ExternalDatabase testContainer() {
128128
if (testContainerDatabase == null) {
129129

130130
try {
131-
OracleContainer container = new OracleContainer("gvenzl/oracle-xe:21.3.0-slim").withReuse(true);
131+
OracleContainer container = new OracleContainer("23.3-slim-faststart").withReuse(true);
132132
container.start();
133133

134134
testContainerDatabase = ProvidedDatabase.builder(container) //

0 commit comments

Comments
 (0)