Skip to content

Commit

Permalink
ci: moves to zipkin's rabbitmq image (#219)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <adrian@tetrate.io>
  • Loading branch information
codefromthecrypt authored Dec 14, 2023
1 parent 4926501 commit fc521af
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 The OpenZipkin Authors
* Copyright 2016-2023 The OpenZipkin Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -60,7 +60,7 @@ RabbitMQSender.Builder newSenderBuilder(String queue) {
void declareQueue(String queue) {
ExecResult result;
try {
result = container.execInContainer("rabbitmqadmin", "declare", "queue", "name=" + queue);
result = container.execInContainer("amqp-declare-queue", "-q", queue);
} catch (Throwable e) {
propagateIfFatal(e);
throw new TestAbortedException(
Expand All @@ -82,11 +82,11 @@ 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/rabbitmq-management-alpine:latest"));
super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:2.25.0"));
if ("true".equals(System.getProperty("docker.skip"))) {
throw new TestAbortedException("${docker.skip} == true");
}
withExposedPorts(RABBIT_PORT); // rabbit's image doesn't expose any port
withExposedPorts(RABBIT_PORT);
waitStrategy = Wait.forLogMessage(".*Server startup complete.*", 1);
withStartupTimeout(Duration.ofSeconds(60));
}
Expand Down

0 comments on commit fc521af

Please sign in to comment.