Browse Source

Upgrade DB2 Docker image to 11.5.7.0a.

Closes #1272
pull/1298/head
Jens Schauder 4 years ago
parent
commit
fbd44bd349
No known key found for this signature in database
GPG Key ID: 45CC872F17423DBF
  1. 2
      ci/accept-third-party-license.sh
  2. 3
      spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/Db2DataSourceConfiguration.java
  3. 2
      spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java

2
ci/accept-third-party-license.sh

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

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

@ -37,6 +37,7 @@ import org.testcontainers.containers.Db2Container;
@Profile("db2") @Profile("db2")
class Db2DataSourceConfiguration extends DataSourceConfiguration { 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 final Log LOG = LogFactory.getLog(Db2DataSourceConfiguration.class);
private static Db2Container DB_2_CONTAINER; private static Db2Container DB_2_CONTAINER;
@ -47,7 +48,7 @@ class Db2DataSourceConfiguration extends DataSourceConfiguration {
if (DB_2_CONTAINER == null) { if (DB_2_CONTAINER == null) {
LOG.info("DB2 starting..."); LOG.info("DB2 starting...");
Db2Container container = new Db2Container().withReuse(true); Db2Container container = new Db2Container(DOCKER_IMAGE_NAME).withReuse(true);
container.start(); container.start();
LOG.info("DB2 started"); LOG.info("DB2 started");

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

@ -43,7 +43,7 @@ public class LicenseListener implements TestExecutionListener {
environment = new StandardEnvironment(); environment = new StandardEnvironment();
if (environment.acceptsProfiles(Profiles.of("db2"))) { 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"))) { if (environment.acceptsProfiles(Profiles.of("mssql"))) {

Loading…
Cancel
Save