Skip to content

Commit c4823b2

Browse files
committed
[Fixes_kie_issues_1749] Switch dockerhub to a mirrored registry
1 parent c91a2de commit c4823b2

File tree

10 files changed

+26
-9
lines changed

10 files changed

+26
-9
lines changed

kogito-build/kogito-build-no-bom-parent/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,9 @@
330330
<maven.repo.local>${session.request.localRepositoryPath.path}</maven.repo.local>
331331
<maven.settings>${session.request.userSettingsFile.path}</maven.settings>
332332
</systemPropertyVariables>
333+
<environmentVariables>
334+
<TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>mirror.gcr.io/</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
335+
</environmentVariables>
333336
<parallel>all</parallel>
334337
</configuration>
335338
</plugin>
@@ -354,6 +357,9 @@
354357
<maven.settings>${session.request.userSettingsFile.path}</maven.settings>
355358
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
356359
</systemPropertyVariables>
360+
<environmentVariables>
361+
<TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>mirror.gcr.io/</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
362+
</environmentVariables>
357363
<parallel>all</parallel>
358364
</configuration>
359365
</plugin>

kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoPostgreSqlContainer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
import org.testcontainers.containers.output.Slf4jLogConsumer;
3030
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
3131
import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
32+
import org.testcontainers.utility.DockerImageName;
33+
34+
import static org.kie.kogito.testcontainers.KogitoGenericContainer.getImageName;
3235

3336
/**
3437
* PostgreSQL Container for Kogito examples.
@@ -40,7 +43,7 @@ public class KogitoPostgreSqlContainer extends PostgreSQLContainer<KogitoPostgre
4043
private static final Logger LOGGER = LoggerFactory.getLogger(KogitoPostgreSqlContainer.class);
4144

4245
public KogitoPostgreSqlContainer() {
43-
super(KogitoGenericContainer.getImageName(NAME));
46+
super(DockerImageName.parse(getImageName(NAME)).asCompatibleSubstituteFor("postgres"));
4447
withLogConsumer(getLogger());
4548
withLogConsumer(new Slf4jLogConsumer(LOGGER));
4649
withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);

kogito-test-utils/src/test/java/org/kie/kogito/testcontainers/KogitoMongoDBContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ void shouldGetMapperPort() {
5454
@Test
5555
void shouldGetDockerImageName() {
5656
assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Aborting test: docker env not found");
57-
assertThat(container.getDockerImageName()).isEqualTo(System.getProperty(Constants.CONTAINER_NAME_PREFIX + KogitoMongoDBContainer.NAME));
57+
assertThat(container.getDockerImageName()).isEqualTo(System.getenv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX") + System.getProperty(Constants.CONTAINER_NAME_PREFIX + KogitoMongoDBContainer.NAME));
5858
}
5959
}

quarkus/addons/events/mongodb/runtime/src/test/resources/application.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ kogito.events.variables.enabled=false
2323
kogito.events.processinstances.collection=testPICollection
2424
kogito.events.usertasks.collection=testUTCollection
2525
kogito.events.variables.collection=testVCollection
26-
kogito.events.database=testDB
26+
kogito.events.database=testDB
27+
28+
quarkus.mongodb.devservices.image-name=mirror.gcr.io/mongo:4.4

quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ quarkus.swagger-ui.always-include=true
2323
kogito.persistence.type=jdbc
2424
kogito.persistence.proto.marshaller=false
2525
quarkus.datasource.db-kind=postgresql
26+
quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
2627
kie.flyway.enabled=true
2728

2829
quarkus.http.test-port=0
@@ -255,4 +256,4 @@ quarkus.http.auth.permission.default.policy=authenticated
255256

256257
quarkus.security.users.embedded.enabled=true
257258
quarkus.security.users.embedded.plain-text=true
258-
quarkus.security.users.embedded.users.buddy=buddy
259+
quarkus.security.users.embedded.users.buddy=buddy

quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/src/main/resources/application.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
kogito.persistence.type=jdbc
2121
#run create tables scripts
2222
quarkus.datasource.db-kind=postgresql
23+
quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
2324

24-
kie.flyway.enabled=true
25+
kie.flyway.enabled=true

quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/src/main/resources/application.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
#
1919

2020
kogito.persistence.type=postgresql
21+
quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
2122

22-
kie.flyway.enabled=true
23+
kie.flyway.enabled=true

quarkus/integration-tests/integration-tests-quarkus-usertasks/src/main/resources/application.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
#
1919

2020
quarkus.datasource.db-kind=postgresql
21+
quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
2122

2223
kogito.persistence.type=jdbc
2324

24-
kie.flyway.enabled=true
25+
kie.flyway.enabled=true

quarkus/test/src/test/java/org/kie/kogito/testcontainers/quarkus/MongoDBQuarkusTestResourceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ void shouldConditionalBeEnabled() {
5353
@Test
5454
void shouldGetDockerImageName() {
5555
givenResource();
56-
assertEquals(System.getProperty(Constants.CONTAINER_NAME_PREFIX + KogitoMongoDBContainer.NAME), resource.getTestResource().getDockerImageName());
56+
assertEquals(System.getenv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX") + System.getProperty(Constants.CONTAINER_NAME_PREFIX + KogitoMongoDBContainer.NAME),
57+
resource.getTestResource().getDockerImageName());
5758
}
5859

5960
private void givenConditionalResource() {

springboot/test/src/test/java/org/kie/kogito/testcontainers/springboot/MongoDBSpringBootTestResourceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ void shouldConditionalBeEnabled() {
6060
@Test
6161
void shouldGetDockerImageName() {
6262
givenResource();
63-
assertEquals(System.getProperty(Constants.CONTAINER_NAME_PREFIX + KogitoMongoDBContainer.NAME), resource.getTestResource().getDockerImageName());
63+
assertEquals(System.getenv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX") + System.getProperty(Constants.CONTAINER_NAME_PREFIX + KogitoMongoDBContainer.NAME),
64+
resource.getTestResource().getDockerImageName());
6465
}
6566

6667
private void givenConditionalResource() {

0 commit comments

Comments
 (0)