This is an automated email from the ASF dual-hosted git repository.
zykkk pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 3ba57eb8a4a [Enhance](regression)enhance docker network by add docker
network subnet (#26872)
3ba57eb8a4a is described below
commit 3ba57eb8a4af3fb01d4d0f800c2e4d7a165ac53f
Author: zhangguoqiang <[email protected]>
AuthorDate: Wed Nov 15 10:29:09 2023 +0800
[Enhance](regression)enhance docker network by add docker network subnet
(#26872)
---
.../docker-compose/clickhouse/clickhouse.yaml.tpl | 9 +++++++--
.../docker-compose/elasticsearch/es.yaml.tpl | 6 +++++-
docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl | 6 ++++--
.../docker-compose/iceberg/iceberg.yaml.tpl | 4 ++++
.../docker-compose/mariadb/mariadb-10.yaml.tpl | 9 +++++++--
.../docker-compose/mysql/mysql-5.7.yaml.tpl | 9 +++++++--
.../docker-compose/oracle/oracle-11.yaml.tpl | 9 +++++++--
.../docker-compose/postgresql/postgresql-14.yaml.tpl | 8 +++++++-
.../docker-compose/sqlserver/sqlserver.yaml.tpl | 17 +++++++++++------
.../docker-compose/trino/trino_hive.yaml.tpl | 6 ++++--
10 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
b/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
index 6e34c459be3..6827c02e2a3 100644
--- a/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
+++ b/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
@@ -38,11 +38,16 @@ services:
- ./init:/docker-entrypoint-initdb.d
networks:
- doris--clickhouse
- hello-world:
+ doris--clickhouse-hello-world:
image: hello-world
depends_on:
doris--clickhouse:
condition: service_healthy
-
+ networks:
+ - doris--clickhouse
networks:
doris--clickhouse:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.35.0.0/24
\ No newline at end of file
diff --git a/docker/thirdparties/docker-compose/elasticsearch/es.yaml.tpl
b/docker/thirdparties/docker-compose/elasticsearch/es.yaml.tpl
index ddd181c011d..92ce5cd0170 100644
--- a/docker/thirdparties/docker-compose/elasticsearch/es.yaml.tpl
+++ b/docker/thirdparties/docker-compose/elasticsearch/es.yaml.tpl
@@ -93,4 +93,8 @@ services:
- doris--es
networks:
- doris--es:
\ No newline at end of file
+ doris--es:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.36.0.0/24
\ No newline at end of file
diff --git a/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
b/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
index f0878e452be..73427adbac7 100644
--- a/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
+++ b/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
@@ -19,8 +19,10 @@ version: "3.3"
networks:
doris--hudi:
- driver: bridge
-
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.37.0.0/24
services:
namenode:
diff --git a/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
b/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
index 343c8dd2e5a..d7220f24376 100644
--- a/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
+++ b/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
@@ -93,3 +93,7 @@ services:
"
networks:
doris--iceberg:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.38.0.0/24
\ No newline at end of file
diff --git a/docker/thirdparties/docker-compose/mariadb/mariadb-10.yaml.tpl
b/docker/thirdparties/docker-compose/mariadb/mariadb-10.yaml.tpl
index ad3f3109549..d6427c992fe 100644
--- a/docker/thirdparties/docker-compose/mariadb/mariadb-10.yaml.tpl
+++ b/docker/thirdparties/docker-compose/mariadb/mariadb-10.yaml.tpl
@@ -39,11 +39,16 @@ services:
- ./init:/docker-entrypoint-initdb.d
networks:
- doris--mariadb
- hello-world:
+ doris--mariadb-hello-world:
image: hello-world
depends_on:
doris--mariadb:
condition: service_healthy
-
+ networks:
+ - doris--mariadb
networks:
doris--mariadb:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.39.0.0/24
\ No newline at end of file
diff --git a/docker/thirdparties/docker-compose/mysql/mysql-5.7.yaml.tpl
b/docker/thirdparties/docker-compose/mysql/mysql-5.7.yaml.tpl
index 01cebf3aa54..7e2fe5075f1 100644
--- a/docker/thirdparties/docker-compose/mysql/mysql-5.7.yaml.tpl
+++ b/docker/thirdparties/docker-compose/mysql/mysql-5.7.yaml.tpl
@@ -39,11 +39,16 @@ services:
- ./init:/docker-entrypoint-initdb.d
networks:
- doris--mysql_57
- hello-world:
+ doris--mysql-hello-world:
image: hello-world
depends_on:
doris--mysql_57:
condition: service_healthy
-
+ networks:
+ - doris--mysql_57
networks:
doris--mysql_57:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.34.0.0/24
\ No newline at end of file
diff --git a/docker/thirdparties/docker-compose/oracle/oracle-11.yaml.tpl
b/docker/thirdparties/docker-compose/oracle/oracle-11.yaml.tpl
index 448b009170b..e68a41bebf5 100644
--- a/docker/thirdparties/docker-compose/oracle/oracle-11.yaml.tpl
+++ b/docker/thirdparties/docker-compose/oracle/oracle-11.yaml.tpl
@@ -39,11 +39,16 @@ services:
- TZ=Asia/Shanghai
networks:
- doris--oracle_11
- hello-world:
+ doris--oracle-hello-world:
image: hello-world
depends_on:
doris--oracle_11:
condition: service_healthy
-
+ networks:
+ - doris--oracle_11
networks:
doris--oracle_11:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.40.0.0/24
\ No newline at end of file
diff --git
a/docker/thirdparties/docker-compose/postgresql/postgresql-14.yaml.tpl
b/docker/thirdparties/docker-compose/postgresql/postgresql-14.yaml.tpl
index ae63c2b9bda..7b76bb99a18 100644
--- a/docker/thirdparties/docker-compose/postgresql/postgresql-14.yaml.tpl
+++ b/docker/thirdparties/docker-compose/postgresql/postgresql-14.yaml.tpl
@@ -35,10 +35,16 @@ services:
- ./init:/docker-entrypoint-initdb.d
networks:
- doris--postgres
- doris--hello-world:
+ doris--postgres-hello-world:
image: hello-world
depends_on:
doris--postgres:
condition: service_healthy
+ networks:
+ - doris--postgres
networks:
doris--postgres:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.41.0.0/24
\ No newline at end of file
diff --git a/docker/thirdparties/docker-compose/sqlserver/sqlserver.yaml.tpl
b/docker/thirdparties/docker-compose/sqlserver/sqlserver.yaml.tpl
index 04b5eb976e6..724b877c9e8 100644
--- a/docker/thirdparties/docker-compose/sqlserver/sqlserver.yaml.tpl
+++ b/docker/thirdparties/docker-compose/sqlserver/sqlserver.yaml.tpl
@@ -62,11 +62,16 @@ services:
- SA_PASSWORD=Doris123456
networks:
- doris--sqlserver_2022
- hello-world:
- image: hello-world
- depends_on:
- doris--sqlserver_2022:
- condition: service_healthy
-
+ doris--sqlserver-hello-world:
+ image: hello-world
+ depends_on:
+ doris--sqlserver_2022:
+ condition: service_healthy
+ networks:
+ - doris--sqlserver_2022
networks:
doris--sqlserver_2022:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.42.0.0/24
\ No newline at end of file
diff --git a/docker/thirdparties/docker-compose/trino/trino_hive.yaml.tpl
b/docker/thirdparties/docker-compose/trino/trino_hive.yaml.tpl
index f034a0c7bda..30ac1eec09b 100644
--- a/docker/thirdparties/docker-compose/trino/trino_hive.yaml.tpl
+++ b/docker/thirdparties/docker-compose/trino/trino_hive.yaml.tpl
@@ -19,8 +19,10 @@ version: "3.8"
networks:
doris--network:
- driver: bridge
-
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.43.0.0/24
services:
doris--trino:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
