[Fixes_kie_issues_1749] Switch dockerhub to a mirrored registry

apache · Jan 15, 2025 · 0339d5f · 0339d5f
1 parent c91a2de
commit 0339d5f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/kogito-build/kogito-build-no-bom-parent/pom.xml b/kogito-build/kogito-build-no-bom-parent/pom.xml
@@ -48,13 +48,13 @@
     <checkstyle.logViolationsToConsole>true</checkstyle.logViolationsToConsole>
 
     <!-- container images for testing -->
-    <container.image.infinispan>infinispan/server:${version.org.infinispan}</container.image.infinispan>
+    <container.image.infinispan>mirror.gcr.io/infinispan/server:${version.org.infinispan}</container.image.infinispan>
     <container.image.keycloak>quay.io/keycloak/keycloak:${version.org.keycloak}</container.image.keycloak>
-    <container.image.kafka>redpandadata/redpanda:v24.3.1</container.image.kafka>
-    <container.image.wurstmeister.kafka>wurstmeister/kafka:${version.wurstmeister.kafka}</container.image.wurstmeister.kafka>
-    <container.image.mongodb>library/mongo:${version.org.mongo-image}</container.image.mongodb>
-    <container.image.redis>redislabs/redisearch:${version.org.redis}</container.image.redis>
-    <container.image.postgres>postgres:${version.org.postgres}</container.image.postgres>
+    <container.image.kafka>mirror.gcr.io/redpandadata/redpanda:v24.3.1</container.image.kafka>
+    <container.image.wurstmeister.kafka>mirror.gcr.io/wurstmeister/kafka:${version.wurstmeister.kafka}</container.image.wurstmeister.kafka>
+    <container.image.mongodb>mirror.gcr.io/library/mongo:${version.org.mongo-image}</container.image.mongodb>
+    <container.image.redis>mirror.gcr.io/redislabs/redisearch:${version.org.redis}</container.image.redis>
+    <container.image.postgres>mirror.gcr.io/postgres:${version.org.postgres}</container.image.postgres>
 
     <maven.compiler.release>17</maven.compiler.release>
     <maven.compiler.source>17</maven.compiler.source>
@@ -114,6 +114,7 @@
     <version.surefire.plugin>3.1.2</version.surefire.plugin> <!-- minimum required by JUnit 5 -->
     <version.surefire.report.plugin>3.1.2</version.surefire.report.plugin>
     <version.taglist.plugin>2.4</version.taglist.plugin>
+    <version.testcontainers.ryuk>0.7.0</version.testcontainers.ryuk>
     <!-- Versions plugin should stay on version 2.5
       until https://github.com/mojohaus/versions-maven-plugin/issues/312 is fixed -->
     <version.versions.plugin>2.5</version.versions.plugin>
@@ -330,6 +331,9 @@
               <maven.repo.local>${session.request.localRepositoryPath.path}</maven.repo.local>
               <maven.settings>${session.request.userSettingsFile.path}</maven.settings>
             </systemPropertyVariables>
+            <environmentVariables>
+               <TESTCONTAINERS_RYUK_CONTAINER_IMAGE>mirror.gcr.io/testcontainers/ryuk:${version.testcontainers.ryuk}</TESTCONTAINERS_RYUK_CONTAINER_IMAGE>
+            </environmentVariables>
             <parallel>all</parallel>
           </configuration>
         </plugin>
@@ -354,6 +358,9 @@
               <maven.settings>${session.request.userSettingsFile.path}</maven.settings>
               <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
             </systemPropertyVariables>
+            <environmentVariables>
+               <TESTCONTAINERS_RYUK_CONTAINER_IMAGE>mirror.gcr.io/testcontainers/ryuk:${version.testcontainers.ryuk}</TESTCONTAINERS_RYUK_CONTAINER_IMAGE>
+            </environmentVariables>
             <parallel>all</parallel>
           </configuration>
         </plugin>

diff --git a/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoPostgreSqlContainer.java b/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoPostgreSqlContainer.java
@@ -29,6 +29,9 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import static org.kie.kogito.testcontainers.KogitoGenericContainer.getImageName;
 
 /**
  * PostgreSQL Container for Kogito examples.
@@ -40,7 +43,7 @@ public class KogitoPostgreSqlContainer extends PostgreSQLContainer<KogitoPostgre
     private static final Logger LOGGER = LoggerFactory.getLogger(KogitoPostgreSqlContainer.class);
 
     public KogitoPostgreSqlContainer() {
-        super(KogitoGenericContainer.getImageName(NAME));
+        super(DockerImageName.parse(getImageName(NAME)).asCompatibleSubstituteFor("postgres"));
         withLogConsumer(getLogger());
         withLogConsumer(new Slf4jLogConsumer(LOGGER));
         withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);

diff --git a/quarkus/addons/events/mongodb/runtime/src/test/resources/application.properties b/quarkus/addons/events/mongodb/runtime/src/test/resources/application.properties
@@ -23,4 +23,6 @@ kogito.events.variables.enabled=false
 kogito.events.processinstances.collection=testPICollection
 kogito.events.usertasks.collection=testUTCollection
 kogito.events.variables.collection=testVCollection
-kogito.events.database=testDB
+kogito.events.database=testDB
+
+quarkus.mongodb.devservices.image-name=mirror.gcr.io/mongo:4.4
diff --git a/...to-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties b/...to-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties
@@ -23,6 +23,7 @@ quarkus.swagger-ui.always-include=true
 kogito.persistence.type=jdbc
 kogito.persistence.proto.marshaller=false
 quarkus.datasource.db-kind=postgresql
+quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
 kie.flyway.enabled=true
 
 quarkus.http.test-port=0
@@ -255,4 +256,4 @@ quarkus.http.auth.permission.default.policy=authenticated
 
 quarkus.security.users.embedded.enabled=true
 quarkus.security.users.embedded.plain-text=true
-quarkus.security.users.embedded.users.buddy=buddy
+quarkus.security.users.embedded.users.buddy=buddy
diff --git a/...stence/integration-tests-quarkus-processes-jdbc/src/main/resources/application.properties b/...stence/integration-tests-quarkus-processes-jdbc/src/main/resources/application.properties
@@ -20,5 +20,6 @@
 kogito.persistence.type=jdbc
 #run create tables scripts
 quarkus.datasource.db-kind=postgresql
+quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
 
-kie.flyway.enabled=true
+kie.flyway.enabled=true
diff --git a/...ation-tests/integration-tests-quarkus-usertasks/src/main/resources/application.properties b/...ation-tests/integration-tests-quarkus-usertasks/src/main/resources/application.properties
@@ -18,7 +18,8 @@
 #
 
 quarkus.datasource.db-kind=postgresql
+quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
 
 kogito.persistence.type=jdbc
 
-kie.flyway.enabled=true
+kie.flyway.enabled=true