From e9df6408fafa9aa42e3c6b6e3b0be4e67087e65c Mon Sep 17 00:00:00 2001 From: Geoffrey GREBERT Date: Fri, 22 Dec 2023 22:38:47 +0100 Subject: [PATCH] remove the base URI for docker.io images This feature allow users to use a mirror registry to bypass the docker hub rate limit. --- build-parent/pom.xml | 20 +++++++++---------- docs/pom.xml | 2 +- .../KafkaDevServicesBuildTimeConfig.java | 2 +- .../client/DevServicesRedisProcessor.java | 2 +- ...chDevServicesConfiguredExplicitlyTest.java | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 21a5223eeb88c1..15298d084cc885 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -82,22 +82,22 @@ 8.9.1 - docker.io/elastic/elasticsearch:${elasticsearch-server.version} - docker.io/elastic/logstash:${elasticsearch-server.version} - docker.io/elastic/kibana:${elasticsearch-server.version} + elastic/elasticsearch:${elasticsearch-server.version} + elastic/logstash:${elasticsearch-server.version} + elastic/kibana:${elasticsearch-server.version} http 2.9.0 - docker.io/opensearchproject/opensearch:${opensearch-server.version} + opensearchproject/opensearch:${opensearch-server.version} http - docker.io/postgres:14 - docker.io/mariadb:10.11 - docker.io/ibmcom/db2:11.5.7.0a + postgres:14 + mariadb:10.11 + ibmcom/db2:11.5.7.0a mcr.microsoft.com/mssql/server:2022-latest - docker.io/mysql:8.0 - docker.io/gvenzl/oracle-free:23-slim-faststart - docker.io/mongo:4.4 + mysql:8.0 + gvenzl/oracle-free:23-slim-faststart + mongo:4.4 4.13.2 diff --git a/docs/pom.xml b/docs/pom.xml index 274c6effd891e3..b0182f60283e9d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -36,7 +36,7 @@ https://github.com/quarkusio/quarkus-quickstarts ${project.basedir}/../target/asciidoc/generated ${generated-dir}/examples - docker.io/jdkato/vale:v2.15.5 + jdkato/vale:v2.15.5 6.4 diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaDevServicesBuildTimeConfig.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaDevServicesBuildTimeConfig.java index 5c909c99a674ae..76dd6609c17316 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaDevServicesBuildTimeConfig.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaDevServicesBuildTimeConfig.java @@ -47,7 +47,7 @@ public class KafkaDevServicesBuildTimeConfig { public Provider provider = Provider.REDPANDA; public enum Provider { - REDPANDA("docker.io/vectorized/redpanda:v22.3.4"), + REDPANDA("vectorized/redpanda:v22.3.4"), STRIMZI("quay.io/strimzi-test-container/test-container:latest-kafka-3.2.1"), KAFKA_NATIVE("quay.io/ogunalp/kafka-native:latest"); diff --git a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/deployment/client/DevServicesRedisProcessor.java b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/deployment/client/DevServicesRedisProcessor.java index 495d53622852e3..4707bbbad0d2b9 100644 --- a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/deployment/client/DevServicesRedisProcessor.java +++ b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/deployment/client/DevServicesRedisProcessor.java @@ -42,7 +42,7 @@ @BuildSteps(onlyIfNot = IsNormal.class, onlyIf = { GlobalDevServicesConfig.Enabled.class }) public class DevServicesRedisProcessor { private static final Logger log = Logger.getLogger(DevServicesRedisProcessor.class); - private static final String REDIS_IMAGE = "docker.io/redis:7"; + private static final String REDIS_IMAGE = "redis:7"; private static final int REDIS_EXPOSED_PORT = 6379; private static final String REDIS_SCHEME = "redis://"; diff --git a/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesConfiguredExplicitlyTest.java b/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesConfiguredExplicitlyTest.java index 2cef1cc9cbdb86..10acd1bce95b32 100644 --- a/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesConfiguredExplicitlyTest.java +++ b/integration-tests/hibernate-search-orm-opensearch/src/test/java/io/quarkus/it/hibernate/search/orm/opensearch/devservices/HibernateSearchOpenSearchDevServicesConfiguredExplicitlyTest.java @@ -26,7 +26,7 @@ public Map getConfigOverrides() { return Map.of( "quarkus.elasticsearch.devservices.enabled", "true", // This needs to be different from the default image, or the test makes no sense. - "quarkus.elasticsearch.devservices.image-name", "docker.io/opensearchproject/opensearch:2.8.0", + "quarkus.elasticsearch.devservices.image-name", "opensearchproject/opensearch:2.8.0", // This needs to match the version used just above, // so that Hibernate Search itself will assert that we're using a custom version. "quarkus.hibernate-search-orm.elasticsearch.version", "opensearch:2.8");