Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use short image names for Kafka Confluent #773

Merged
merged 1 commit into from
May 5, 2023
Merged

Use short image names for Kafka Confluent #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ...main/java/io/quarkus/test/services/containers/ConfluentKafkaContainerManagedResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ public String getDisplayName() {

@Override
protected GenericContainer<?> initKafkaContainer() {
DockerImageName imageName = DockerImageName
.parse(getKafkaImage() + ":" + getKafkaVersion())
// todo https://github.com/testcontainers/testcontainers-java/issues/5612
.asCompatibleSubstituteFor("confluentinc/cp-kafka");
return new KafkaContainer(imageName)
return new KafkaContainer(DockerImageName.parse(getKafkaImage() + ":" + getKafkaVersion()))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this solved for podman as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I successfully run tests with podman on my local machine using the configuration from this guide https://quarkus.io/guides/podman#linux

.withCreateContainerCmdModifier(cmd -> cmd.withName(DockerUtils.generateDockerContainerName()));
}

Expand Down
2 changes: 1 addition & 1 deletion ...-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.quarkus.test.services.containers.model;

public enum KafkaRegistry {
CONFLUENT("docker.io/confluentinc/cp-schema-registry", "7.3.3", "/", 8081),
CONFLUENT("confluentinc/cp-schema-registry", "7.3.3", "/", 8081),
APICURIO("quay.io/apicurio/apicurio-registry-mem", "2.4.2.Final", "/apis", 8080);

private final String image;
Expand Down
2 changes: 1 addition & 1 deletion ...st-service-kafka/src/main/java/io/quarkus/test/services/containers/model/KafkaVendor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.quarkus.test.services.containers.model;

public enum KafkaVendor {
CONFLUENT("docker.io/confluentinc/cp-kafka", "7.3.3", 9093, KafkaRegistry.CONFLUENT),
CONFLUENT("confluentinc/cp-kafka", "7.3.3", 9093, KafkaRegistry.CONFLUENT),
STRIMZI("quay.io/strimzi/kafka", "0.34.0-kafka-3.4.0", 9092, KafkaRegistry.APICURIO);

private final String image;
Expand Down