This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 706599aad2e CAMEL-21576: container pulling adjustments
706599aad2e is described below
commit 706599aad2e48bba5c85502f049006bebf18b1ac
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Thu Jan 2 09:59:45 2025 +0100
CAMEL-21576: container pulling adjustments
---
.../slot/integration/PgReplicationITSupport.java | 5 ++++-
components/camel-pulsar/pom.xml | 23 ----------------------
.../infra/arangodb/services/container.properties | 2 +-
.../test/infra/aws2/services/container.properties | 2 +-
.../services/CassandraLocalContainerService.java | 3 ++-
.../infra/cassandra/services/container.properties | 2 +-
.../infra/chatscript/services/container.properties | 2 +-
.../test/infra/cli/services/CliBuiltContainer.java | 2 +-
.../infra/consul/services/container.properties | 2 +-
.../services/CouchbaseLocalContainerService.java | 5 +++--
.../infra/couchbase/services/container.properties | 2 +-
.../infra/couchdb/services/container.properties | 2 +-
.../test/infra/fhir/services/container.properties | 2 +-
.../hashicorp/vault/services/container.properties | 3 ++-
.../services/LocalHiveMQSparkplugTCKService.java | 5 +----
.../camel/test/infra/hivemq/services/Dockerfile | 2 +-
.../infra/hivemq/services/container.properties | 2 +-
.../services/ContainerLocalAuthKafkaService.java | 2 +-
.../kafka/services/ContainerLocalKafkaService.java | 5 +++--
.../test/infra/kafka/services/container.properties | 4 ++--
.../infra/milvus/services/container.properties | 2 +-
.../test/infra/minio/services/container.properties | 2 +-
.../infra/mongodb/services/container.properties | 2 +-
.../infra/mosquitto/services/container.properties | 2 +-
.../test/infra/nats/services/container.properties | 2 +-
.../infra/ollama/services/container.properties | 2 +-
.../infra/openldap/services/container.properties | 2 +-
.../infra/opensearch/services/container.properties | 2 +-
.../infra/postgres/services/container.properties | 2 +-
.../services/PulsarLocalContainerService.java | 2 +-
.../infra/pulsar/services/container.properties | 2 +-
.../services/QdrantLocalContainerService.java | 2 +-
.../infra/qdrant/services/container.properties | 2 +-
.../services/RabbitMQLocalContainerService.java | 3 ++-
.../infra/rabbitmq/services/container.properties | 2 +-
.../test/infra/redis/services/container.properties | 2 +-
.../infra/rocketmq/services/container.properties | 2 +-
.../camel/test/infra/smb/services/Dockerfile | 2 +-
.../test/infra/solr/services/container.properties | 2 +-
.../serving/services/container.properties | 2 +-
.../infra/torchserve/services/container.properties | 2 +-
.../test/infra/xmpp/services/container.properties | 2 +-
.../infra/zookeeper/services/container.properties | 2 +-
43 files changed, 53 insertions(+), 71 deletions(-)
diff --git
a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationITSupport.java
b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationITSupport.java
index a8b1e47b787..54f81c03815 100644
---
a/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationITSupport.java
+++
b/components/camel-pg-replication-slot/src/test/java/org/apache/camel/component/pg/replication/slot/integration/PgReplicationITSupport.java
@@ -21,6 +21,7 @@ import
org.apache.camel.test.infra.postgres.services.PostgresLocalContainerServi
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
public class PgReplicationITSupport extends CamelTestSupport {
@@ -28,7 +29,9 @@ public class PgReplicationITSupport extends CamelTestSupport {
static PostgresLocalContainerService service;
static {
- PostgreSQLContainer container = new
PostgreSQLContainer<>(PostgresLocalContainerService.DEFAULT_POSTGRES_CONTAINER)
+ PostgreSQLContainer container = new PostgreSQLContainer<>(
+
DockerImageName.parse(PostgresLocalContainerService.DEFAULT_POSTGRES_CONTAINER)
+ .asCompatibleSubstituteFor("postgres"))
.withDatabaseName("camel")
.withCommand("postgres -c wal_level=logical");
diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml
index 952123d50e4..3692e218adc 100644
--- a/components/camel-pulsar/pom.xml
+++ b/components/camel-pulsar/pom.xml
@@ -91,27 +91,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>full</id>
- <activation>
- <property>
- <name>!quickly</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
-
<pulsar.container>apachepulsar/pulsar:${pulsar-version}</pulsar.container>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git
a/test-infra/camel-test-infra-arangodb/src/test/resources/org/apache/camel/test/infra/arangodb/services/container.properties
b/test-infra/camel-test-infra-arangodb/src/test/resources/org/apache/camel/test/infra/arangodb/services/container.properties
index baff7a3baa5..9f4ac8d82f9 100644
---
a/test-infra/camel-test-infra-arangodb/src/test/resources/org/apache/camel/test/infra/arangodb/services/container.properties
+++
b/test-infra/camel-test-infra-arangodb/src/test/resources/org/apache/camel/test/infra/arangodb/services/container.properties
@@ -15,4 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
## tested against 2.1.2, 2.2.0 & 2.3.1
-arangodb.container=arangodb:3.12
\ No newline at end of file
+arangodb.container=mirror.gcr.io/arangodb:3.12
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-aws-v2/src/test/resources/org/apache/camel/test/infra/aws2/services/container.properties
b/test-infra/camel-test-infra-aws-v2/src/test/resources/org/apache/camel/test/infra/aws2/services/container.properties
index b746d32b981..6c777030eab 100644
---
a/test-infra/camel-test-infra-aws-v2/src/test/resources/org/apache/camel/test/infra/aws2/services/container.properties
+++
b/test-infra/camel-test-infra-aws-v2/src/test/resources/org/apache/camel/test/infra/aws2/services/container.properties
@@ -15,4 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-aws.container=localstack/localstack:3.8.1
+aws.container=mirror.gcr.io/localstack/localstack:3.8.1
diff --git
a/test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerService.java
b/test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerService.java
index dfdcf04f65e..797e5ea57a4 100644
---
a/test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerService.java
+++
b/test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerService.java
@@ -22,6 +22,7 @@ import
org.apache.camel.test.infra.common.services.ContainerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.CassandraContainer;
+import org.testcontainers.utility.DockerImageName;
/**
* A service for a local instance of Apache Cassandra running with
TestContainers
@@ -46,7 +47,7 @@ public class CassandraLocalContainerService implements
CassandraService, Contain
}
protected CassandraContainer initContainer(String imageName) {
- return new CassandraContainer(imageName);
+ return new
CassandraContainer(DockerImageName.parse(imageName).asCompatibleSubstituteFor("cassandra"));
}
@Override
diff --git
a/test-infra/camel-test-infra-cassandra/src/test/resources/org/apache/camel/test/infra/cassandra/services/container.properties
b/test-infra/camel-test-infra-cassandra/src/test/resources/org/apache/camel/test/infra/cassandra/services/container.properties
index 1811babb6c9..88620225000 100644
---
a/test-infra/camel-test-infra-cassandra/src/test/resources/org/apache/camel/test/infra/cassandra/services/container.properties
+++
b/test-infra/camel-test-infra-cassandra/src/test/resources/org/apache/camel/test/infra/cassandra/services/container.properties
@@ -15,4 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
## tested against 2.1.2, 2.2.0 & 2.3.1
-cassandra.container=cassandra:5.0.2
+cassandra.container=mirror.gcr.io/cassandra:5.0.2
diff --git
a/test-infra/camel-test-infra-chatscript/src/test/resources/org/apache/camel/test/infra/chatscript/services/container.properties
b/test-infra/camel-test-infra-chatscript/src/test/resources/org/apache/camel/test/infra/chatscript/services/container.properties
index 9439ffc32cb..2fb9d50301e 100644
---
a/test-infra/camel-test-infra-chatscript/src/test/resources/org/apache/camel/test/infra/chatscript/services/container.properties
+++
b/test-infra/camel-test-infra-chatscript/src/test/resources/org/apache/camel/test/infra/chatscript/services/container.properties
@@ -15,4 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
## tested against 2.1.2, 2.2.0 & 2.3.1
-chatscript.container=claytantor/chatscript-docker:latest
\ No newline at end of file
+chatscript.container=mirror.gcr.io/claytantor/chatscript-docker:latest
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java
index 07ba0b11798..cd33390fc81 100644
---
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java
+++
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java
@@ -36,7 +36,7 @@ public class CliBuiltContainer extends
GenericContainer<CliBuiltContainer> {
private static final String KEEP_RUNNING_ARG = "KEEP_RUNNING";
private static final String MOUNT_POINT = "/deployments/data";
private static final String SSH_PASSWORD_ARG = "SSH_PASSWORD_ARG";
- private static final String FROM_IMAGE_NAME = "fedora:40";
+ private static final String FROM_IMAGE_NAME = "mirror.gcr.io/fedora:40";
private static final String FROM_IMAGE_ARG = "FROMIMAGE";
protected static final int DEV_CONSOLE_PORT = 8080;
protected static final int SSH_PORT = 22;
diff --git
a/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties
b/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties
index a729c3bd58b..700a36c52d5 100644
---
a/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties
+++
b/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties
@@ -15,5 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
## tested against 2.1.2, 2.2.0 & 2.3.1
-consul.container=hashicorp/consul:1.19
+consul.container=mirror.gcr.io/hashicorp/consul:1.19
consul.container.ppc64le=icr.io/ppc64le-oss/consul-ppc64le:1.9.4
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
b/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
index 1e09073c514..89093f7e127 100644
---
a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
+++
b/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
@@ -23,18 +23,19 @@ import
org.apache.camel.test.infra.couchbase.common.CouchbaseProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.couchbase.CouchbaseContainer;
+import org.testcontainers.utility.DockerImageName;
public class CouchbaseLocalContainerService implements CouchbaseService,
ContainerService<CouchbaseContainer> {
/*
* Couchbase container uses a dynamic port for the KV service. The
configuration
- * used in the Camel component tries to use that port by default and it
seems
+ * used in the Camel component tries to use that port by default, and it
seems
* we cannot configure it. Therefore, we override the default container and
* force the default KV port to be used.
*/
private class CustomCouchbaseContainer extends CouchbaseContainer {
public CustomCouchbaseContainer(String imageName) {
- super(imageName);
+
super(DockerImageName.parse(imageName).asCompatibleSubstituteFor("couchbase/server"));
final int kvPort = 11210;
addFixedExposedPort(kvPort, kvPort);
diff --git
a/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties
b/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties
index 4d9be46e6bb..b8632802855 100644
---
a/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties
+++
b/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties
@@ -15,4 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
## tested against 2.1.2, 2.2.0 & 2.3.1
-couchbase.container=couchbase/server:7.6.2
\ No newline at end of file
+couchbase.container=mirror.gcr.io/couchbase/server:7.6.2
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-couchdb/src/test/resources/org/apache/camel/test/infra/couchdb/services/container.properties
b/test-infra/camel-test-infra-couchdb/src/test/resources/org/apache/camel/test/infra/couchdb/services/container.properties
index ae434c55762..52908ff2562 100644
---
a/test-infra/camel-test-infra-couchdb/src/test/resources/org/apache/camel/test/infra/couchdb/services/container.properties
+++
b/test-infra/camel-test-infra-couchdb/src/test/resources/org/apache/camel/test/infra/couchdb/services/container.properties
@@ -15,4 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
## tested against 2.1.2, 2.2.0 & 2.3.1
-couchdb.container=couchdb:2.3.1
\ No newline at end of file
+couchdb.container=mirror.gcr.io/couchdb:2.3.1
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-fhir/src/test/resources/org/apache/camel/test/infra/fhir/services/container.properties
b/test-infra/camel-test-infra-fhir/src/test/resources/org/apache/camel/test/infra/fhir/services/container.properties
index fb6c8d654d5..96aeec89fff 100644
---
a/test-infra/camel-test-infra-fhir/src/test/resources/org/apache/camel/test/infra/fhir/services/container.properties
+++
b/test-infra/camel-test-infra-fhir/src/test/resources/org/apache/camel/test/infra/fhir/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-fhir.container=hapiproject/hapi:v7.4.0
+fhir.container=mirror.gcr.io/hapiproject/hapi:v7.4.0
diff --git
a/test-infra/camel-test-infra-hashicorp-vault/src/test/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties
b/test-infra/camel-test-infra-hashicorp-vault/src/test/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties
index 557ce422617..669ae9ffbdb 100644
---
a/test-infra/camel-test-infra-hashicorp-vault/src/test/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties
+++
b/test-infra/camel-test-infra-hashicorp-vault/src/test/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties
@@ -14,5 +14,6 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-hashicorp.vault.container=hashicorp/vault:1.17.5
+hashicorp.vault.container=mirror.gcr.io/hashicorp/vault:1.17.5
hashicorp.vault.container.ppc64le=icr.io/ppc64le-oss/vault-ppc64le:v1.13.1
+
diff --git
a/test-infra/camel-test-infra-hivemq/src/test/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKService.java
b/test-infra/camel-test-infra-hivemq/src/test/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKService.java
index 9575e25eb56..a5f2c83667a 100644
---
a/test-infra/camel-test-infra-hivemq/src/test/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKService.java
+++
b/test-infra/camel-test-infra-hivemq/src/test/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKService.java
@@ -31,9 +31,6 @@ public final class LocalHiveMQSparkplugTCKService extends
AbstractLocalHiveMQSer
@Override
protected HiveMQContainer initContainer(String imageName) {
- String hivemqContainerName
- =
LocalPropertyResolver.getProperty(LocalHiveMQSparkplugTCKService.class,
HiveMQProperties.HIVEMQ_CONTAINER);
-
String dockerfileResourcePath =
LocalPropertyResolver.getProperty(LocalHiveMQSparkplugTCKService.class,
HiveMQProperties.HIVEMQ_RESOURCE_PATH);
@@ -42,7 +39,7 @@ public final class LocalHiveMQSparkplugTCKService extends
AbstractLocalHiveMQSer
String newImageName = newImage.get();
HiveMQContainer newContainer
- = new
HiveMQContainer(DockerImageName.parse(newImageName).asCompatibleSubstituteFor(hivemqContainerName));
+ = new
HiveMQContainer(DockerImageName.parse(newImageName).asCompatibleSubstituteFor("hivemq/hivemq-ce"));
return newContainer;
}
diff --git
a/test-infra/camel-test-infra-hivemq/src/test/resources/org/apache/camel/test/infra/hivemq/services/Dockerfile
b/test-infra/camel-test-infra-hivemq/src/test/resources/org/apache/camel/test/infra/hivemq/services/Dockerfile
index 4b72e275c8d..85d62357d46 100644
---
a/test-infra/camel-test-infra-hivemq/src/test/resources/org/apache/camel/test/infra/hivemq/services/Dockerfile
+++
b/test-infra/camel-test-infra-hivemq/src/test/resources/org/apache/camel/test/infra/hivemq/services/Dockerfile
@@ -17,7 +17,7 @@
ARG HIVEMQ_VERSION=2024.6
-FROM hivemq/hivemq-ce:$HIVEMQ_VERSION as hivemq-ce-sparkplug-tck
+FROM mirror.gcr.io/hivemq/hivemq-ce:$HIVEMQ_VERSION as hivemq-ce-sparkplug-tck
ARG SPARKPLUG_TCK_VERSION=3.0.0
diff --git
a/test-infra/camel-test-infra-hivemq/src/test/resources/org/apache/camel/test/infra/hivemq/services/container.properties
b/test-infra/camel-test-infra-hivemq/src/test/resources/org/apache/camel/test/infra/hivemq/services/container.properties
index a7d7e8f7612..1575a00ed31 100644
---
a/test-infra/camel-test-infra-hivemq/src/test/resources/org/apache/camel/test/infra/hivemq/services/container.properties
+++
b/test-infra/camel-test-infra-hivemq/src/test/resources/org/apache/camel/test/infra/hivemq/services/container.properties
@@ -14,6 +14,6 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-hivemq.container=hivemq/hivemq-ce:2024.6
+hivemq.container=mirror.gcr.io/hivemq/hivemq-ce:2024.6
hivemq.resource.path=org/apache/camel/test/infra/hivemq/services
hivemq.sparkplug.container=localhost/hivemq-ce-sparkplug-tck:camel
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
index e0934710c80..a34e61c5bb7 100644
---
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
+++
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
@@ -34,7 +34,7 @@ public class ContainerLocalAuthKafkaService implements
KafkaService, ContainerSe
super(DockerImageName.parse(System.getProperty(
KafkaProperties.KAFKA_CONTAINER,
ContainerLocalKafkaService.KAFKA3_IMAGE_NAME))
-
.asCompatibleSubstituteFor(ContainerLocalKafkaService.KAFKA3_IMAGE_NAME));
+ .asCompatibleSubstituteFor("apache/kafka"));
final MountableFile mountableFile =
MountableFile.forClasspathResource(jaasConfigFile);
LOG.debug("Using mountable file at: {}",
mountableFile.getFilesystemPath());
diff --git
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
index 4450498288f..e803e6f3cf5 100644
---
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
+++
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
@@ -43,7 +43,8 @@ public class ContainerLocalKafkaService implements
KafkaService, ContainerServic
protected KafkaContainer initContainer() {
return new KafkaContainer(
-
DockerImageName.parse(System.getProperty(KafkaProperties.KAFKA_CONTAINER,
KAFKA3_IMAGE_NAME)));
+
DockerImageName.parse(System.getProperty(KafkaProperties.KAFKA_CONTAINER,
KAFKA3_IMAGE_NAME))
+ .asCompatibleSubstituteFor("apache/kafka"));
}
public String getBootstrapServers() {
@@ -78,7 +79,7 @@ public class ContainerLocalKafkaService implements
KafkaService, ContainerServic
KafkaContainer container
= new KafkaContainer(
DockerImageName.parse(System.getProperty(KafkaProperties.KAFKA_CONTAINER,
KAFKA3_IMAGE_NAME))
-
.asCompatibleSubstituteFor(ContainerLocalKafkaService.KAFKA3_IMAGE_NAME));
+ .asCompatibleSubstituteFor("apache/kafka"));
return new ContainerLocalKafkaService(container);
}
diff --git
a/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties
b/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties
index 72f259aebbc..155faffa2d6 100644
---
a/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties
+++
b/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties
@@ -14,6 +14,6 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-kafka3.container=apache/kafka:3.8.1
-redpanda.container.image=redpandadata/redpanda:v24.1.16
+kafka3.container=mirror.gcr.io/apache/kafka:3.8.1
+redpanda.container.image=mirror.gcr.io/redpandadata/redpanda:v24.1.16
strimzi.container.image=quay.io/strimzi/kafka:latest-kafka-3.7.0
diff --git
a/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties
b/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties
index 625c4e0ca93..77a72123ff8 100644
---
a/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties
+++
b/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-milvus.container=milvusdb/milvus:v2.4.5
+milvus.container=mirror.gcr.io/milvusdb/milvus:v2.4.5
milvus.container.ppc64le=icr.io/ppc64le-oss/milvus-ppc64le:v2.4.11
diff --git
a/test-infra/camel-test-infra-minio/src/test/resources/org/apache/camel/test/infra/minio/services/container.properties
b/test-infra/camel-test-infra-minio/src/test/resources/org/apache/camel/test/infra/minio/services/container.properties
index be3ebdc9d32..10e7272cea5 100644
---
a/test-infra/camel-test-infra-minio/src/test/resources/org/apache/camel/test/infra/minio/services/container.properties
+++
b/test-infra/camel-test-infra-minio/src/test/resources/org/apache/camel/test/infra/minio/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-minio.container=minio/minio:RELEASE.2024-11-07T00-52-20Z-cpuv1
+minio.container=mirror.gcr.io/minio/minio:RELEASE.2024-11-07T00-52-20Z-cpuv1
diff --git
a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties
b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties
index b42628340ed..c48d54d4cd2 100644
---
a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties
+++
b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-mongodb.container=mongo:7.0.12-jammy
+mongodb.container=mirror.gcr.io/mongo:7.0.12-jammy
mongodb.container.ppc64le=icr.io/ppc64le-oss/mongodb-ppc64le:4.4.24
diff --git
a/test-infra/camel-test-infra-mosquitto/src/test/resources/org/apache/camel/test/infra/mosquitto/services/container.properties
b/test-infra/camel-test-infra-mosquitto/src/test/resources/org/apache/camel/test/infra/mosquitto/services/container.properties
index 1a9ae3e41d9..c3e87443e60 100644
---
a/test-infra/camel-test-infra-mosquitto/src/test/resources/org/apache/camel/test/infra/mosquitto/services/container.properties
+++
b/test-infra/camel-test-infra-mosquitto/src/test/resources/org/apache/camel/test/infra/mosquitto/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-mosquitto.container=eclipse-mosquitto:2.0.18
\ No newline at end of file
+mosquitto.container=mirror.gcr.io/eclipse-mosquitto:2.0.18
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties
b/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties
index deec64739b1..173274eb6ee 100644
---
a/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties
+++
b/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-nats.container=nats:2.10.20
+nats.container=mirror.gcr.io/nats:2.10.20
diff --git
a/test-infra/camel-test-infra-ollama/src/test/resources/org/apache/camel/test/infra/ollama/services/container.properties
b/test-infra/camel-test-infra-ollama/src/test/resources/org/apache/camel/test/infra/ollama/services/container.properties
index 03400a1ea4e..0774247a7ad 100644
---
a/test-infra/camel-test-infra-ollama/src/test/resources/org/apache/camel/test/infra/ollama/services/container.properties
+++
b/test-infra/camel-test-infra-ollama/src/test/resources/org/apache/camel/test/infra/ollama/services/container.properties
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-ollama.container=ollama/ollama:0.3.5
+ollama.container=mirror.gcr.io/ollama/ollama:0.3.5
ollama.model=orca-mini
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-openldap/src/test/resources/org/apache/camel/test/infra/openldap/services/container.properties
b/test-infra/camel-test-infra-openldap/src/test/resources/org/apache/camel/test/infra/openldap/services/container.properties
index aa5c4685c50..161c475c86f 100644
---
a/test-infra/camel-test-infra-openldap/src/test/resources/org/apache/camel/test/infra/openldap/services/container.properties
+++
b/test-infra/camel-test-infra-openldap/src/test/resources/org/apache/camel/test/infra/openldap/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-openldap.container=osixia/openldap:1.5.0
\ No newline at end of file
+openldap.container=mirror.gcr.io/osixia/openldap:1.5.0
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-opensearch/src/test/resources/org/apache/camel/test/infra/opensearch/services/container.properties
b/test-infra/camel-test-infra-opensearch/src/test/resources/org/apache/camel/test/infra/opensearch/services/container.properties
index 6db0ebec483..d5171ba1859 100644
---
a/test-infra/camel-test-infra-opensearch/src/test/resources/org/apache/camel/test/infra/opensearch/services/container.properties
+++
b/test-infra/camel-test-infra-opensearch/src/test/resources/org/apache/camel/test/infra/opensearch/services/container.properties
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-opensearch.container=opensearchproject/opensearch:2.18.0
+opensearch.container=mirror.gcr.io/opensearchproject/opensearch:2.18.0
opensearch.container.ppc64le=icr.io/ppc64le-oss/opensearch-ppc64le:2.12.0
diff --git
a/test-infra/camel-test-infra-postgres/src/test/resources/org/apache/camel/test/infra/postgres/services/container.properties
b/test-infra/camel-test-infra-postgres/src/test/resources/org/apache/camel/test/infra/postgres/services/container.properties
index 988adca44e0..49e4cfde23f 100644
---
a/test-infra/camel-test-infra-postgres/src/test/resources/org/apache/camel/test/infra/postgres/services/container.properties
+++
b/test-infra/camel-test-infra-postgres/src/test/resources/org/apache/camel/test/infra/postgres/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-postgres.container=postgres:16.4-alpine
+postgres.container=mirror.gcr.io/postgres:16.4-alpine
diff --git
a/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
b/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
index 3a02c693502..5795d37a9d9 100644
---
a/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
+++
b/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
@@ -45,7 +45,7 @@ public class PulsarLocalContainerService implements
PulsarService, ContainerServ
}
protected PulsarContainer initContainer(String imageName) {
- return new PulsarContainer(DockerImageName.parse(imageName))
+ return new
PulsarContainer(DockerImageName.parse(imageName).asCompatibleSubstituteFor("apachepulsar/pulsar"))
.withStartupTimeout(Duration.ofMinutes(3L));
}
diff --git
a/test-infra/camel-test-infra-pulsar/src/test/resources/org/apache/camel/test/infra/pulsar/services/container.properties
b/test-infra/camel-test-infra-pulsar/src/test/resources/org/apache/camel/test/infra/pulsar/services/container.properties
index f126b143ff3..16ad01d0f05 100644
---
a/test-infra/camel-test-infra-pulsar/src/test/resources/org/apache/camel/test/infra/pulsar/services/container.properties
+++
b/test-infra/camel-test-infra-pulsar/src/test/resources/org/apache/camel/test/infra/pulsar/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-pulsar.container=apachepulsar/pulsar:3.3.0
\ No newline at end of file
+pulsar.container=mirror.gcr.io/apachepulsar/pulsar:3.3.0
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerService.java
b/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerService.java
index cd4b6bd0f1d..4e8bfe5e455 100644
---
a/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerService.java
+++
b/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerService.java
@@ -38,7 +38,7 @@ public class QdrantLocalContainerService implements
QdrantService, ContainerServ
}
public QdrantLocalContainerService(String imageName) {
- this(new QdrantContainer(DockerImageName.parse(imageName)));
+ this(new
QdrantContainer(DockerImageName.parse(imageName).asCompatibleSubstituteFor("qdrant/qdrant")));
}
public QdrantLocalContainerService(QdrantContainer container) {
diff --git
a/test-infra/camel-test-infra-qdrant/src/test/resources/org/apache/camel/test/infra/qdrant/services/container.properties
b/test-infra/camel-test-infra-qdrant/src/test/resources/org/apache/camel/test/infra/qdrant/services/container.properties
index 9dbefca8f73..289fcc12fbe 100644
---
a/test-infra/camel-test-infra-qdrant/src/test/resources/org/apache/camel/test/infra/qdrant/services/container.properties
+++
b/test-infra/camel-test-infra-qdrant/src/test/resources/org/apache/camel/test/infra/qdrant/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-qdrant.container=qdrant/qdrant:v1.12.1-unprivileged
+qdrant.container=mirror.gcr.io/qdrant/qdrant:v1.12.1-unprivileged
diff --git
a/test-infra/camel-test-infra-rabbitmq/src/test/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerService.java
b/test-infra/camel-test-infra-rabbitmq/src/test/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerService.java
index fe461ce2920..92c812acb11 100644
---
a/test-infra/camel-test-infra-rabbitmq/src/test/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerService.java
+++
b/test-infra/camel-test-infra-rabbitmq/src/test/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerService.java
@@ -23,6 +23,7 @@ import
org.apache.camel.test.infra.rabbitmq.common.RabbitMQProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.RabbitMQContainer;
+import org.testcontainers.utility.DockerImageName;
public class RabbitMQLocalContainerService implements RabbitMQService,
ContainerService<RabbitMQContainer> {
private static final Logger LOG =
LoggerFactory.getLogger(RabbitMQLocalContainerService.class);
@@ -42,7 +43,7 @@ public class RabbitMQLocalContainerService implements
RabbitMQService, Container
}
protected RabbitMQContainer initContainer(String imageName) {
- return new RabbitMQContainer(imageName);
+ return new
RabbitMQContainer(DockerImageName.parse(imageName).asCompatibleSubstituteFor("rabbitmq"));
}
@Override
diff --git
a/test-infra/camel-test-infra-rabbitmq/src/test/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties
b/test-infra/camel-test-infra-rabbitmq/src/test/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties
index f51c841a4ad..eb6cce4971d 100644
---
a/test-infra/camel-test-infra-rabbitmq/src/test/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties
+++
b/test-infra/camel-test-infra-rabbitmq/src/test/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-rabbitmq.container=rabbitmq:3.13
+rabbitmq.container=mirror.gcr.io/rabbitmq:3.13
diff --git
a/test-infra/camel-test-infra-redis/src/test/resources/org/apache/camel/test/infra/redis/services/container.properties
b/test-infra/camel-test-infra-redis/src/test/resources/org/apache/camel/test/infra/redis/services/container.properties
index eb5e2d3ea0f..8315abd73dd 100644
---
a/test-infra/camel-test-infra-redis/src/test/resources/org/apache/camel/test/infra/redis/services/container.properties
+++
b/test-infra/camel-test-infra-redis/src/test/resources/org/apache/camel/test/infra/redis/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-redis.container=redis:7.4.0-alpine
+redis.container=mirror.gcr.io/redis:7.4.0-alpine
diff --git
a/test-infra/camel-test-infra-rocketmq/src/test/resources/org/apache/camel/test/infra/rocketmq/services/container.properties
b/test-infra/camel-test-infra-rocketmq/src/test/resources/org/apache/camel/test/infra/rocketmq/services/container.properties
index 00bcdf96b4e..2c61a1d0c7e 100644
---
a/test-infra/camel-test-infra-rocketmq/src/test/resources/org/apache/camel/test/infra/rocketmq/services/container.properties
+++
b/test-infra/camel-test-infra-rocketmq/src/test/resources/org/apache/camel/test/infra/rocketmq/services/container.properties
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-rocketmq.container.image=apache/rocketmq
+rocketmq.container.image=mirror.gcr.io/apache/rocketmq
rocketmq.container.image.version=5.2.0
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-smb/src/test/resources/org/apache/camel/test/infra/smb/services/Dockerfile
b/test-infra/camel-test-infra-smb/src/test/resources/org/apache/camel/test/infra/smb/services/Dockerfile
index bb237ba18d5..68d1a75d214 100644
---
a/test-infra/camel-test-infra-smb/src/test/resources/org/apache/camel/test/infra/smb/services/Dockerfile
+++
b/test-infra/camel-test-infra-smb/src/test/resources/org/apache/camel/test/infra/smb/services/Dockerfile
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM fedora:40 as samba
+FROM mirror.gcr.io/fedora:40 as samba
LABEL maintainer="[email protected]"
ENV SAMBA_ROOT /opt/camel/samba
EXPOSE 139 445
diff --git
a/test-infra/camel-test-infra-solr/src/test/resources/org/apache/camel/test/infra/solr/services/container.properties
b/test-infra/camel-test-infra-solr/src/test/resources/org/apache/camel/test/infra/solr/services/container.properties
index 7d6cc6885f4..863c7fde0d8 100644
---
a/test-infra/camel-test-infra-solr/src/test/resources/org/apache/camel/test/infra/solr/services/container.properties
+++
b/test-infra/camel-test-infra-solr/src/test/resources/org/apache/camel/test/infra/solr/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-solr.container=solr:9.7.0-slim
+solr.container=mirror.gcr.io/solr:9.7.0-slim
diff --git
a/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties
b/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties
index a8eaa1e637a..b97f934eb8b 100644
---
a/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties
+++
b/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-tensorflow.serving.container=tensorflow/serving:2.18.0
+tensorflow.serving.container=mirror.gcr.io/tensorflow/serving:2.18.0
tensorflow.serving.container.aarch64=bitnami/tensorflow-serving:2.18.0
diff --git
a/test-infra/camel-test-infra-torchserve/src/test/resources/org/apache/camel/test/infra/torchserve/services/container.properties
b/test-infra/camel-test-infra-torchserve/src/test/resources/org/apache/camel/test/infra/torchserve/services/container.properties
index 615e381020a..73607589063 100644
---
a/test-infra/camel-test-infra-torchserve/src/test/resources/org/apache/camel/test/infra/torchserve/services/container.properties
+++
b/test-infra/camel-test-infra-torchserve/src/test/resources/org/apache/camel/test/infra/torchserve/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-torchserve.container=pytorch/torchserve:0.12.0-cpu
+torchserve.container=mirror.gcr.io/pytorch/torchserve:0.12.0-cpu
diff --git
a/test-infra/camel-test-infra-xmpp/src/test/resources/org/apache/camel/test/infra/xmpp/services/container.properties
b/test-infra/camel-test-infra-xmpp/src/test/resources/org/apache/camel/test/infra/xmpp/services/container.properties
index 2d1f6b377c6..b691084fff3 100644
---
a/test-infra/camel-test-infra-xmpp/src/test/resources/org/apache/camel/test/infra/xmpp/services/container.properties
+++
b/test-infra/camel-test-infra-xmpp/src/test/resources/org/apache/camel/test/infra/xmpp/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-xmpp.container=5mattho/vysper-wrapper:0.3
\ No newline at end of file
+xmpp.container=mirror.gcr.io/5mattho/vysper-wrapper:0.3
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-zookeeper/src/test/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
b/test-infra/camel-test-infra-zookeeper/src/test/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
index b8026d1eb0e..a40948aa3c3 100644
---
a/test-infra/camel-test-infra-zookeeper/src/test/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
+++
b/test-infra/camel-test-infra-zookeeper/src/test/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-zookeeper.container=zookeeper:3.9
+zookeeper.container=mirror.gcr.io/zookeeper:3.9
zookeeper.container.ppc64le=icr.io/ppc64le-oss/zookeeper-ppc64le:3.5.10
\ No newline at end of file
