Upgrade testcontainers to 1.19.0 (#3560)

This allows integration tests to be run on Apple silicon. Ports need to be explicitly exposed now.
openzipkin · Aug 29, 2023 · 15d36ea · 15d36ea
1 parent d0bdc80
commit 15d36ea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@
     <assertj.version>3.18.1</assertj.version>
     <awaitility.version>4.0.3</awaitility.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <testcontainers.version>1.15.1</testcontainers.version>
+    <testcontainers.version>1.19.0</testcontainers.version>
     <okhttp.version>4.9.0</okhttp.version>
     <okhttp5.version>5.0.0-alpha.11</okhttp5.version>
     <kryo.version>5.0.3</kryo.version>

diff --git a/...-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraStorageExtension.java b/...-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraStorageExtension.java
@@ -160,6 +160,7 @@ static final class CassandraContainer extends GenericContainer<CassandraContaine
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }
+      addExposedPort(9042);
       waitStrategy = Wait.forHealthcheck();
       withLogConsumer(new Slf4jLogConsumer(LOGGER));
     }

diff --git a/...elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java b/...elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java
@@ -131,6 +131,7 @@ static final class ElasticsearchContainer extends GenericContainer<Elasticsearch
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }
+      addExposedPort(9200);
       waitStrategy = Wait.forHealthcheck();
       withLogConsumer(new Slf4jLogConsumer(LOGGER));
     }

diff --git a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java
@@ -117,6 +117,7 @@ static final class MySQLContainer extends GenericContainer<MySQLContainer> {
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }
+      addExposedPort(3306);
       waitStrategy = Wait.forHealthcheck();
       withLogConsumer(new Slf4jLogConsumer(LOGGER));
     }