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

Remove the base URI for docker.io images #37913

Closed
wants to merge 1 commit into from
Closed

Remove the base URI for docker.io images #37913

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
20 changes: 10 additions & 10 deletions build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,22 @@

<!-- Defaults for integration tests -->
<elasticsearch-server.version>8.9.1</elasticsearch-server.version>
<elasticsearch.image>docker.io/elastic/elasticsearch:${elasticsearch-server.version}</elasticsearch.image>
<logstash.image>docker.io/elastic/logstash:${elasticsearch-server.version}</logstash.image>
<kibana.image>docker.io/elastic/kibana:${elasticsearch-server.version}</kibana.image>
<elasticsearch.image>elastic/elasticsearch:${elasticsearch-server.version}</elasticsearch.image>
<logstash.image>elastic/logstash:${elasticsearch-server.version}</logstash.image>
<kibana.image>elastic/kibana:${elasticsearch-server.version}</kibana.image>
<elasticsearch.protocol>http</elasticsearch.protocol>
<opensearch-server.version>2.9.0</opensearch-server.version>
<opensearch.image>docker.io/opensearchproject/opensearch:${opensearch-server.version}</opensearch.image>
<opensearch.image>opensearchproject/opensearch:${opensearch-server.version}</opensearch.image>
<opensearch.protocol>http</opensearch.protocol>

<!-- Database images for JDBC/Reactive/Hibernate tests and devservices -->
<postgres.image>docker.io/postgres:14</postgres.image>
<mariadb.image>docker.io/mariadb:10.11</mariadb.image>
<db2.image>docker.io/ibmcom/db2:11.5.7.0a</db2.image>
<postgres.image>postgres:14</postgres.image>
<mariadb.image>mariadb:10.11</mariadb.image>
<db2.image>ibmcom/db2:11.5.7.0a</db2.image>
<mssql.image>mcr.microsoft.com/mssql/server:2022-latest</mssql.image>
<mysql.image>docker.io/mysql:8.0</mysql.image>
<oracle.image>docker.io/gvenzl/oracle-free:23-slim-faststart</oracle.image>
<mongo.image>docker.io/mongo:4.4</mongo.image>
<mysql.image>mysql:8.0</mysql.image>
<oracle.image>gvenzl/oracle-free:23-slim-faststart</oracle.image>
<mongo.image>mongo:4.4</mongo.image>

<!-- Align various dependencies that are not really part of the bom-->
<junit4.version>4.13.2</junit4.version>
Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<quickstarts-base-url>https://github.com/quarkusio/quarkus-quickstarts</quickstarts-base-url>
<generated-dir>${project.basedir}/../target/asciidoc/generated</generated-dir>
<code-examples-dir>${generated-dir}/examples</code-examples-dir>
<vale.image>docker.io/jdkato/vale:v2.15.5</vale.image>
<vale.image>jdkato/vale:v2.15.5</vale.image>

<!-- Keep these in sync with the full versions in bom/application/pom.xml -->
<hibernate-orm.version-for-documentation>6.4</hibernate-orm.version-for-documentation>
Expand Down
2 changes: 1 addition & 1 deletion ...ent/src/main/java/io/quarkus/kafka/client/deployment/KafkaDevServicesBuildTimeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Comment on lines 51 to 52
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't the same apply to other registries as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For quay.io it is more complicated: the --registry-mirror option works only with relative image.

But we can had a property to replace this value. But in an other PR,


Expand Down
2 changes: 1 addition & 1 deletion ...eployment/src/main/java/io/quarkus/redis/deployment/client/DevServicesRedisProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://";

Expand Down
2 changes: 1 addition & 1 deletion .../opensearch/devservices/HibernateSearchOpenSearchDevServicesConfiguredExplicitlyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public Map<String, String> 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");
Expand Down