Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade DB2 Docker image to 11.5.7.0a.

Browse Source 
Closes #1272
This commit is contained in:
Jens Schauder
2022-06-23 14:57:41 +02:00
parent a271c43c83
commit fbd44bd349
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci/accept-third-party-license.sh
View File

@@ -2,5 +2,5 @@
{
echo "mcr.microsoft.com/mssql/server:2017-CU12"
echo "ibmcom/db2:11.5.0.0a"
} > spring-data-jdbc/src/test/resources/container-license-acceptance.txt
echo "ibmcom/db2:11.5.7.0a"
} > spring-data-jdbc/src/test/resources/container-license-acceptance.txt

3
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/Db2DataSourceConfiguration.java
View File

@@ -37,6 +37,7 @@ import org.testcontainers.containers.Db2Container;
@Profile("db2")
class Db2DataSourceConfiguration extends DataSourceConfiguration {
public static final String DOCKER_IMAGE_NAME = "ibmcom/db2:11.5.7.0a";
private static final Log LOG = LogFactory.getLog(Db2DataSourceConfiguration.class);
private static Db2Container DB_2_CONTAINER;
@@ -47,7 +48,7 @@ class Db2DataSourceConfiguration extends DataSourceConfiguration {
if (DB_2_CONTAINER == null) {
LOG.info("DB2 starting...");
Db2Container container = new Db2Container().withReuse(true);
Db2Container container = new Db2Container(DOCKER_IMAGE_NAME).withReuse(true);
container.start();
LOG.info("DB2 started");

2
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java
View File

@@ -43,7 +43,7 @@ public class LicenseListener implements TestExecutionListener {
environment = new StandardEnvironment();
if (environment.acceptsProfiles(Profiles.of("db2"))) {
assumeLicenseAccepted(Db2Container.DEFAULT_DB2_IMAGE_NAME + ":" + Db2Container.DEFAULT_TAG);
assumeLicenseAccepted(Db2DataSourceConfiguration.DOCKER_IMAGE_NAME);
}
if (environment.acceptsProfiles(Profiles.of("mssql"))) {