This is an automated email from the ASF dual-hosted git repository.
hello-stephen pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new ee1a064d074 [fix](ci) Backport MinIO image migration to branch-4.1
(#68777)
ee1a064d074 is described below
commit ee1a064d0745a006a4f852b67c6115fee8e331e9
Author: Dongyang Li <[email protected]>
AuthorDate: Thu Oct 8 16:34:37 2026 +0800
[fix](ci) Backport MinIO image migration to branch-4.1 (#68777)
### What problem does this PR solve?
Related PR: #67908, #67897
Problem Summary:
Backport the final MinIO image migration from master to branch-4.1. The
upstream `minio/minio` and `minio/mc` repositories reject pulls,
preventing third-party services from starting and causing External
regression to be skipped.
Update all 14 applicable references in 8 files to
`doristhirdpartydocker/minio` and `doristhirdpartydocker/mc`. Preserve
existing release tags, startup arguments, environment variables, and
branch-specific test logic. Align the two previously untagged
Iceberg/Paimon sample images with the release tags selected in #67908.
The master-only `docker/runtime/all-in-one/4.1/compose/cloud.yml` does
not exist on branch-4.1 and is not introduced by this backport.
---
docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl | 4 ++--
docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl | 4 ++--
.../docker-compose/minio/minio-RELEASE.2024-11-07.yaml.tpl | 2 +-
docker/thirdparties/docker-compose/polaris/docker-compose.yaml.tpl | 4 ++--
.../cache/warm_up/test_file_cache_warmup_read_metrics_docker.groovy | 2 +-
samples/datalake/deltalake_and_kudu/trinoconnector-compose.yml | 4 ++--
samples/datalake/hudi/hudi-compose.yml | 4 ++--
samples/datalake/iceberg_and_paimon/docker-compose.yml | 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
b/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
index 64e588f1a6a..94cd3adb3e0 100644
--- a/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
+++ b/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
@@ -25,7 +25,7 @@ networks:
services:
${CONTAINER_UID}hudi-minio:
- image: minio/minio:RELEASE.2025-01-20T14-49-07Z
+ image: doristhirdpartydocker/minio:RELEASE.2025-01-20T14-49-07Z
container_name: ${CONTAINER_UID}hudi-minio
command: server /data --console-address ":${MINIO_CONSOLE_PORT}"
environment:
@@ -38,7 +38,7 @@ services:
- ${HUDI_NETWORK}
${CONTAINER_UID}hudi-minio-mc:
- image: minio/mc:RELEASE.2025-01-17T23-25-50Z
+ image: doristhirdpartydocker/mc:RELEASE.2025-01-17T23-25-50Z
container_name: ${CONTAINER_UID}hudi-minio-mc
entrypoint: |
/bin/bash -c "
diff --git a/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
b/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
index 098a1cf4eed..0ea1088377e 100644
--- a/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
+++ b/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
@@ -178,7 +178,7 @@ services:
retries: 120
minio:
- image: minio/minio:RELEASE.2025-01-20T14-49-07Z
+ image: doristhirdpartydocker/minio:RELEASE.2025-01-20T14-49-07Z
container_name: doris--iceberg-minio
ports:
- ${MINIO_API_PORT}:9000
@@ -204,7 +204,7 @@ services:
depends_on:
minio:
condition: service_healthy
- image: minio/mc:RELEASE.2025-01-17T23-25-50Z
+ image: doristhirdpartydocker/mc:RELEASE.2025-01-17T23-25-50Z
container_name: doris--iceberg-mc
environment:
- AWS_ACCESS_KEY_ID=admin
diff --git
a/docker/thirdparties/docker-compose/minio/minio-RELEASE.2024-11-07.yaml.tpl
b/docker/thirdparties/docker-compose/minio/minio-RELEASE.2024-11-07.yaml.tpl
index c637b45c14c..81ddd8ba027 100644
--- a/docker/thirdparties/docker-compose/minio/minio-RELEASE.2024-11-07.yaml.tpl
+++ b/docker/thirdparties/docker-compose/minio/minio-RELEASE.2024-11-07.yaml.tpl
@@ -19,7 +19,7 @@ version: '3'
services:
doris--minio:
- image: minio/minio:RELEASE.2024-11-07T00-52-20Z
+ image: doristhirdpartydocker/minio:RELEASE.2024-11-07T00-52-20Z
restart: always
ports:
- ${DOCKER_MINIO_EXTERNAL_PORT}:9000
diff --git a/docker/thirdparties/docker-compose/polaris/docker-compose.yaml.tpl
b/docker/thirdparties/docker-compose/polaris/docker-compose.yaml.tpl
index 8a41447b9f7..98124890872 100644
--- a/docker/thirdparties/docker-compose/polaris/docker-compose.yaml.tpl
+++ b/docker/thirdparties/docker-compose/polaris/docker-compose.yaml.tpl
@@ -20,7 +20,7 @@ version: "3.8"
services:
# MinIO: S3 compatible object storage for local dev
minio:
- image: minio/minio:RELEASE.2025-01-20T14-49-07Z
+ image: doristhirdpartydocker/minio:RELEASE.2025-01-20T14-49-07Z
container_name: ${CONTAINER_UID}polaris-minio
ports:
- "${MINIO_API_PORT}:9000"
@@ -42,7 +42,7 @@ services:
# MinIO client to bootstrap bucket and path
minio-client:
- image: minio/mc:RELEASE.2025-01-17T23-25-50Z
+ image: doristhirdpartydocker/mc:RELEASE.2025-01-17T23-25-50Z
container_name: ${CONTAINER_UID}polaris-mc
depends_on:
minio:
diff --git
a/regression-test/suites/cloud_p0/cache/warm_up/test_file_cache_warmup_read_metrics_docker.groovy
b/regression-test/suites/cloud_p0/cache/warm_up/test_file_cache_warmup_read_metrics_docker.groovy
index 8ef6eed35d7..70e90e51a65 100644
---
a/regression-test/suites/cloud_p0/cache/warm_up/test_file_cache_warmup_read_metrics_docker.groovy
+++
b/regression-test/suites/cloud_p0/cache/warm_up/test_file_cache_warmup_read_metrics_docker.groovy
@@ -99,7 +99,7 @@ suite('test_file_cache_warmup_read_metrics_docker', 'docker')
{
-e MINIO_ROOT_USER=minioadmin \
-e MINIO_ROOT_PASSWORD=minioadmin \
-e MINIO_DOMAIN=host.docker.internal \
- minio/minio:RELEASE.2024-11-07T00-52-20Z \
+ doristhirdpartydocker/minio:RELEASE.2024-11-07T00-52-20Z \
server /data --console-address ':9001'
"""
waitForCondition({
diff --git a/samples/datalake/deltalake_and_kudu/trinoconnector-compose.yml
b/samples/datalake/deltalake_and_kudu/trinoconnector-compose.yml
index e88348b3e6f..9a602293fee 100644
--- a/samples/datalake/deltalake_and_kudu/trinoconnector-compose.yml
+++ b/samples/datalake/deltalake_and_kudu/trinoconnector-compose.yml
@@ -79,7 +79,7 @@ services:
minio:
hostname: minio
- image: 'minio/minio:RELEASE.2022-05-26T05-48-41Z'
+ image: 'doristhirdpartydocker/minio:RELEASE.2022-05-26T05-48-41Z'
container_name: minio-storage
ports:
- '${MINIO_SERVICE_PORT}:9000'
@@ -90,7 +90,7 @@ services:
# This job will create the "datalake" bucket on Minio
mc-job:
- image: 'minio/mc:RELEASE.2022-05-09T04-08-26Z'
+ image: 'doristhirdpartydocker/mc:RELEASE.2022-05-09T04-08-26Z'
volumes:
- './data:/data'
entrypoint: |
diff --git a/samples/datalake/hudi/hudi-compose.yml
b/samples/datalake/hudi/hudi-compose.yml
index 59d30451537..423fc701542 100644
--- a/samples/datalake/hudi/hudi-compose.yml
+++ b/samples/datalake/hudi/hudi-compose.yml
@@ -78,7 +78,7 @@ services:
minio:
hostname: minio
- image: 'minio/minio:RELEASE.2022-05-26T05-48-41Z'
+ image: 'doristhirdpartydocker/minio:RELEASE.2022-05-26T05-48-41Z'
container_name: minio-hudi-storage
ports:
- '${MINIO_SERVICE_PORT}:9000'
@@ -89,7 +89,7 @@ services:
# This job will create the "datalake" bucket on Minio
mc-job:
- image: 'minio/mc:RELEASE.2022-05-09T04-08-26Z'
+ image: 'doristhirdpartydocker/mc:RELEASE.2022-05-09T04-08-26Z'
volumes:
- './data:/data'
entrypoint: |
diff --git a/samples/datalake/iceberg_and_paimon/docker-compose.yml
b/samples/datalake/iceberg_and_paimon/docker-compose.yml
index 739b2bfbed7..3cebe1391b4 100644
--- a/samples/datalake/iceberg_and_paimon/docker-compose.yml
+++ b/samples/datalake/iceberg_and_paimon/docker-compose.yml
@@ -59,7 +59,7 @@ services:
- './scripts:/opt/scripts'
minio:
- image: minio/minio
+ image: doristhirdpartydocker/minio:RELEASE.2025-09-07T16-13-09Z
container_name: doris-iceberg-paimon-minio
ports:
- ${MINIO_API_PORT}:9000
@@ -77,7 +77,7 @@ services:
mc:
depends_on:
- minio
- image: minio/mc
+ image: doristhirdpartydocker/mc:RELEASE.2025-08-13T08-35-41Z
container_name: doris-iceberg-paimon-mc
environment:
- AWS_ACCESS_KEY_ID=admin
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
