Skip to content

Commit fbd44bd

Browse files
committed
Upgrade DB2 Docker image to 11.5.7.0a.
Closes #1272
1 parent a271c43 commit fbd44bd

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

ci/accept-third-party-license.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
@Profile("db2")
3838
class Db2DataSourceConfiguration extends DataSourceConfiguration {
3939

40+
public static final String DOCKER_IMAGE_NAME = "ibmcom/db2:11.5.7.0a";
4041
private static final Log LOG = LogFactory.getLog(Db2DataSourceConfiguration.class);
4142

4243
private static Db2Container DB_2_CONTAINER;
@@ -47,7 +48,7 @@ protected DataSource createDataSource() {
4748
if (DB_2_CONTAINER == null) {
4849

4950
LOG.info("DB2 starting...");
50-
Db2Container container = new Db2Container().withReuse(true);
51+
Db2Container container = new Db2Container(DOCKER_IMAGE_NAME).withReuse(true);
5152
container.start();
5253
LOG.info("DB2 started");
5354

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void prepareTestInstance(TestContext testContext) {
4343
environment = new StandardEnvironment();
4444

4545
if (environment.acceptsProfiles(Profiles.of("db2"))) {
46-
assumeLicenseAccepted(Db2Container.DEFAULT_DB2_IMAGE_NAME + ":" + Db2Container.DEFAULT_TAG);
46+
assumeLicenseAccepted(Db2DataSourceConfiguration.DOCKER_IMAGE_NAME);
4747
}
4848

4949
if (environment.acceptsProfiles(Profiles.of("mssql"))) {

0 commit comments

Comments
 (0)