From c8bbf4e3c85a47da7f464a5be08b667d81ca90a3 Mon Sep 17 00:00:00 2001
From: Andrew Guibert <andy.guibert@gmail.com>
Date: Wed, 16 Dec 2020 15:53:52 -0600
Subject: [PATCH] Upgrade to Testcontainers 1.15.1 and use prebuilt image for
 DB2

---
 pom.xml                                             |   2 +-
 .../java/io/vertx/db2client/junit/DB2Resource.java  |   9 ++++++---
 .../src/test/resources/vertx-db2-ssl/Dockerfile     |   5 +++++
 .../{tls/server => vertx-db2-ssl/certs}/server.kdb  | Bin
 .../{tls/server => vertx-db2-ssl/certs}/server.sth  |   0
 .../setup_scripts}/db2_tls_setup.sh                 |   0
 6 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 vertx-db2-client/src/test/resources/vertx-db2-ssl/Dockerfile
 rename vertx-db2-client/src/test/resources/{tls/server => vertx-db2-ssl/certs}/server.kdb (100%)
 rename vertx-db2-client/src/test/resources/{tls/server => vertx-db2-ssl/certs}/server.sth (100%)
 rename vertx-db2-client/src/test/resources/{tls => vertx-db2-ssl/setup_scripts}/db2_tls_setup.sh (100%)

diff --git a/pom.xml b/pom.xml
index 20b14ed75..d96b0d068 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <jar.manifest>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</jar.manifest>
     <!-- We skip sources jar generation as we do it with the assembly plugin to have greater control over the content -->
     <source.skip>true</source.skip>
-    <testcontainers.version>1.12.4</testcontainers.version>
+    <testcontainers.version>1.15.1</testcontainers.version>
   </properties>
 
   <dependencyManagement>
diff --git a/vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java b/vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java
index 246ee5660..f7980b7d4 100644
--- a/vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java
+++ b/vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java
@@ -27,6 +27,7 @@
 import org.junit.rules.ExternalResource;
 import org.testcontainers.containers.Db2Container;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 import io.vertx.core.net.JksOptions;
 import io.vertx.db2client.DB2ConnectOptions;
@@ -35,6 +36,9 @@ public class DB2Resource extends ExternalResource {
 
   private static final boolean CUSTOM_DB2 = get("DB2_HOST") != null;
 
+  private static final DockerImageName db2Image = DockerImageName.parse("aguibert/vertx-db2-ssl:1.0")
+      .asCompatibleSubstituteFor("ibmcom/db2");
+
     /**
      * In order for this container to be reused across test runs you need to add the line:
      * <code>testcontainers.reuse.enable=true</code> to your <code>~/.testcontainers.properties</code>
@@ -45,15 +49,14 @@ public class DB2Resource extends ExternalResource {
     private boolean started = false;
     private boolean isDb2OnZ = false;
     private DB2ConnectOptions options;
-    private final Db2Container instance = new Db2Container()
+
+    private final Db2Container instance = new Db2Container(db2Image)
             .acceptLicense()
             .withLogConsumer(out -> System.out.print("[DB2] " + out.getUtf8String()))
             .withUsername("vertx")
             .withPassword("vertx")
             .withDatabaseName("vertx")
             .withExposedPorts(50000, 50001)
-            .withFileSystemBind("src/test/resources/tls/server/", "/certs/")
-            .withFileSystemBind("src/test/resources/tls/db2_tls_setup.sh", "/var/custom/db2_tls_setup.sh")
             .waitingFor(new LogMessageWaitStrategy()
                 .withRegEx(".*VERTX SSH SETUP DONE.*")
                 .withStartupTimeout(Duration.ofMinutes(10)))
diff --git a/vertx-db2-client/src/test/resources/vertx-db2-ssl/Dockerfile b/vertx-db2-client/src/test/resources/vertx-db2-ssl/Dockerfile
new file mode 100644
index 000000000..ba0d58c87
--- /dev/null
+++ b/vertx-db2-client/src/test/resources/vertx-db2-ssl/Dockerfile
@@ -0,0 +1,5 @@
+FROM ibmcom/db2:11.5.0.0a
+
+COPY certs/ /certs/
+COPY setup_scripts/ /var/custom/
+            
\ No newline at end of file
diff --git a/vertx-db2-client/src/test/resources/tls/server/server.kdb b/vertx-db2-client/src/test/resources/vertx-db2-ssl/certs/server.kdb
similarity index 100%
rename from vertx-db2-client/src/test/resources/tls/server/server.kdb
rename to vertx-db2-client/src/test/resources/vertx-db2-ssl/certs/server.kdb
diff --git a/vertx-db2-client/src/test/resources/tls/server/server.sth b/vertx-db2-client/src/test/resources/vertx-db2-ssl/certs/server.sth
similarity index 100%
rename from vertx-db2-client/src/test/resources/tls/server/server.sth
rename to vertx-db2-client/src/test/resources/vertx-db2-ssl/certs/server.sth
diff --git a/vertx-db2-client/src/test/resources/tls/db2_tls_setup.sh b/vertx-db2-client/src/test/resources/vertx-db2-ssl/setup_scripts/db2_tls_setup.sh
similarity index 100%
rename from vertx-db2-client/src/test/resources/tls/db2_tls_setup.sh
rename to vertx-db2-client/src/test/resources/vertx-db2-ssl/setup_scripts/db2_tls_setup.sh