Skip to content

Commit

Permalink
bumps to latest test docker images (#3791)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <[email protected]>
  • Loading branch information
codefromthecrypt authored Feb 4, 2025
1 parent 43f88ea commit 4254a48
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class ServerIntegratedBenchmark {

@Test void elasticsearch() throws Exception {
GenericContainer<?> elasticsearch =
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:3.4.2"))
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:3.4.3"))
.withNetwork(Network.SHARED)
.withNetworkAliases("elasticsearch")
.withLabel("name", "elasticsearch")
Expand All @@ -95,7 +95,7 @@ class ServerIntegratedBenchmark {

@Test void cassandra3() throws Exception {
GenericContainer<?> cassandra =
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.2"))
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.3"))
.withNetwork(Network.SHARED)
.withNetworkAliases("cassandra")
.withLabel("name", "cassandra")
Expand All @@ -109,7 +109,7 @@ class ServerIntegratedBenchmark {

@Test void mysql() throws Exception {
GenericContainer<?> mysql =
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.2"))
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.3"))
.withNetwork(Network.SHARED)
.withNetworkAliases("mysql")
.withLabel("name", "mysql")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ String brokerURL() {
// mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
static final class ActiveMQContainer extends GenericContainer<ActiveMQContainer> {
ActiveMQContainer() {
super(parse("ghcr.io/openzipkin/zipkin-activemq:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-activemq:3.4.3"));
withExposedPorts(ACTIVEMQ_PORT);
waitStrategy = Wait.forListeningPorts(ACTIVEMQ_PORT);
withStartupTimeout(Duration.ofSeconds(60));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ KafkaCollector.Builder newCollectorBuilder(String topic, int streams) {
// mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
static final class KafkaContainer extends GenericContainer<KafkaContainer> {
KafkaContainer() {
super(parse("ghcr.io/openzipkin/zipkin-kafka:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-kafka:3.4.3"));
waitStrategy = Wait.forHealthcheck();
// 19092 is for connections from the Docker host and needs to be used as a fixed port.
// TODO: someone who knows Kafka well, make ^^ comment better!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int port() {
// mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
static final class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
RabbitMQContainer() {
super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:3.4.3"));
withExposedPorts(RABBIT_PORT);
waitStrategy = Wait.forLogMessage(".*Server startup complete.*", 1);
withStartupTimeout(Duration.ofSeconds(60));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static final class EurekaContainer extends GenericContainer<EurekaContainer> {
static final int EUREKA_PORT = 8761;

EurekaContainer(Map<String, String> env) {
super(parse("ghcr.io/openzipkin/zipkin-eureka:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-eureka:3.4.3"));
withEnv(env);
withExposedPorts(EUREKA_PORT);
waitStrategy = Wait.forHealthcheck();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class CassandraContainer extends GenericContainer<CassandraContainer> {
CqlSession globalSession;

CassandraContainer() {
super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.3"));
addExposedPort(9042);
waitStrategy = Wait.forHealthcheck();
withLogConsumer(new Slf4jLogConsumer(LOGGER));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ElasticsearchExtension extends ElasticsearchBaseExtension {
// mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
static final class ElasticsearchContainer extends GenericContainer<ElasticsearchContainer> {
ElasticsearchContainer(int majorVersion) {
super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.4.3"));
addExposedPort(9200);
waitStrategy = Wait.forHealthcheck();
withLogConsumer(new Slf4jLogConsumer(LOGGER));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class OpenSearchExtension extends ElasticsearchBaseExtension {
// mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
static final class OpenSearchContainer extends GenericContainer<OpenSearchContainer> {
OpenSearchContainer(int majorVersion) {
super(parse("ghcr.io/openzipkin/zipkin-opensearch" + majorVersion + ":3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-opensearch" + majorVersion + ":3.4.3"));
addExposedPort(9200);
waitStrategy = Wait.forHealthcheck();
withLogConsumer(new Slf4jLogConsumer(LOGGER));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ int port() {
// mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
static final class MySQLContainer extends GenericContainer<MySQLContainer> {
MySQLContainer() {
super(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.3"));
addExposedPort(3306);
waitStrategy = Wait.forHealthcheck();
withLogConsumer(new Slf4jLogConsumer(LOGGER));
Expand Down

0 comments on commit 4254a48

Please sign in to comment.