Skip to content

Commit 522f36f

Browse files
authored
Accept hashicorp/consul image (#6797)
Currently, `ConsulContainer` accepts `consul` from Docker Official Image. But, there is a deprecation notice and recommend to use `hashicorp/consul` instead. In order to keep backward compatibility, both `consul` and `hashicorp/consul` are valid images.
1 parent 9f82f59 commit 522f36f

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

modules/consul/src/main/java/org/testcontainers/consul/ConsulContainer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
*/
1818
public class ConsulContainer extends GenericContainer<ConsulContainer> {
1919

20-
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("consul");
20+
private static final DockerImageName DEFAULT_OLD_IMAGE_NAME = DockerImageName.parse("consul");
21+
22+
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("hashicorp/consul");
2123

2224
private static final int CONSUL_HTTP_PORT = 8500;
2325

@@ -33,7 +35,7 @@ public ConsulContainer(String dockerImageName) {
3335

3436
public ConsulContainer(final DockerImageName dockerImageName) {
3537
super(dockerImageName);
36-
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
38+
dockerImageName.assertCompatibleWith(DEFAULT_OLD_IMAGE_NAME, DEFAULT_IMAGE_NAME);
3739

3840
// Use the status leader endpoint to verify if consul is running.
3941
setWaitStrategy(Wait.forHttp("/v1/status/leader").forPort(CONSUL_HTTP_PORT).forStatusCode(200));

modules/consul/src/test/java/org/testcontainers/consul/ConsulContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
public class ConsulContainerTest {
2424

2525
@ClassRule
26-
public static ConsulContainer consulContainer = new ConsulContainer(ConsulTestImages.CONSUL_IMAGE)
26+
public static ConsulContainer consulContainer = new ConsulContainer("hashicorp/consul:1.15")
2727
.withConsulCommand("kv put config/testing1 value123");
2828

2929
@Test

modules/consul/src/test/java/org/testcontainers/consul/ConsulTestImages.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)