Skip to content

Commit 707e3a0

Browse files
committed
[fix](docker) Backport external Docker improvements to branch-4.1
1 parent 4d0af10 commit 707e3a0

280 files changed

Lines changed: 5156 additions & 2521 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docker/thirdparties/custom_settings.env‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ export OSSBucket="doris-regression-bj"
2828
# Optional Maven repository override for thirdparty jar downloads.
2929
# export MAVEN_REPOSITORY_URL="https://maven.aliyun.com/repository/central"
3030
export MAVEN_REPOSITORY_URL="${MAVEN_REPOSITORY_URL:-https://repo1.maven.org/maven2}"
31+
# Hive shared-volume baseline rollout settings.
32+
# Update HIVE_BASELINE_VERSION when publishing a new baseline tarball.
33+
export HIVE_BASELINE_VERSION="20260415"
34+
export HIVE_BASELINE_TARBALL_CACHE="${ROOT}/docker-compose/hive/scripts/baseline"

‎docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ services:
3333
healthcheck:
3434
test: ["CMD-SHELL", "clickhouse-client --password=123456 --query 'SELECT 1 FROM doris_test.deadline'"]
3535
interval: 30s
36-
timeout: 10s
37-
retries: 5
36+
timeout: 30s
37+
retries: 20
38+
start_period: 180s
3839
volumes:
3940
- ./init:/docker-entrypoint-initdb.d
4041
networks:

‎docker/thirdparties/docker-compose/db2/db2.yaml.tpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ services:
2727
test: ["CMD-SHELL", "su - db2inst1 -c \"source ~/.bash_profile; db2 connect to doris && db2 'select 1 from sysibm.sysdummy1'\""]
2828
interval: 20s
2929
timeout: 60s
30-
retries: 10
30+
retries: 30
31+
start_period: 300s
3132
volumes:
3233
- ./init:/docker-entrypoint-initdb.d
3334
environment:

0 commit comments

Comments
 (0)