This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 1edeacd0a54 [enhance](regression) enhance docker network by add
network subnet (#26862)
1edeacd0a54 is described below
commit 1edeacd0a54a86f0272e91aab81fd5f850c664c3
Author: zhangguoqiang <[email protected]>
AuthorDate: Tue Nov 14 20:06:20 2023 +0800
[enhance](regression) enhance docker network by add network subnet (#26862)
---
.idea/vcs.xml | 36 +++++++++++-----------
.../docker-compose/clickhouse/clickhouse.yaml.tpl | 10 ++++--
.../docker-compose/elasticsearch/es.yaml.tpl | 6 +++-
.../thirdparties/docker-compose/hudi/hudi.yaml.tpl | 5 ++-
.../docker-compose/iceberg/iceberg.yaml.tpl | 4 +++
.../docker-compose/mariadb/mariadb-10.yaml.tpl | 8 ++++-
.../docker-compose/mysql/mysql-5.7.yaml.tpl | 9 ++++--
.../docker-compose/oracle/oracle-11.yaml.tpl | 8 ++++-
.../postgresql/postgresql-14.yaml.tpl | 11 +++++--
.../docker-compose/sqlserver/sqlserver.yaml.tpl | 17 ++++++----
.../docker-compose/trino/trino_hive.yaml.tpl | 5 ++-
11 files changed, 84 insertions(+), 35 deletions(-)
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index cc4ed74dc08..0a185d9bdc7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,19 +16,19 @@
limitations under the License.
-->
<project version="4">
- <component name="IssueNavigationConfiguration">
- <option name="links">
- <list>
- <IssueNavigationLink>
- <option name="issueRegexp" value="#(\d+)" />
- <option name="linkRegexp"
value="https://github.com/apache/doris/pull/$1"; />
- </IssueNavigationLink>
- </list>
- </option>
- </component>
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
- <mapping directory="$PROJECT_DIR$/be/src/apache-orc" vcs="Git" />
- <mapping directory="$PROJECT_DIR$/be/src/clucene" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
+ <component name="IssueNavigationConfiguration">
+ <option name="links">
+ <list>
+ <IssueNavigationLink>
+ <option name="issueRegexp" value="#(\d+)" />
+ <option name="linkRegexp"
value="https://github.com/apache/doris/pull/$1"; />
+ </IssueNavigationLink>
+ </list>
+ </option>
+ </component>
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/be/src/apache-orc" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/be/src/clucene" vcs="Git" />
+ </component>
+</project>
diff --git a/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
b/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
index 6e34c459be3..ba0501f3792 100644
--- a/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
+++ b/docker/thirdparties/docker-compose/clickhouse/clickhouse.yaml.tpl
@@ -38,11 +38,17 @@ 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
+ condition: service_healthy
+ networks:
+ - doris--clickhouse
networks:
doris--clickhouse:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.35.0.0/24
diff --git a/docker/thirdparties/docker-compose/elasticsearch/es.yaml.tpl
b/docker/thirdparties/docker-compose/elasticsearch/es.yaml.tpl
index ddd181c011d..38167bad6df 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
diff --git a/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
b/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
index f0878e452be..f15346a90ea 100644
--- a/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
+++ b/docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
@@ -19,7 +19,10 @@ version: "3.3"
networks:
doris--hudi:
- driver: bridge
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.37.0.0/24
services:
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..f6af7ffed84 100644
--- a/docker/thirdparties/docker-compose/mariadb/mariadb-10.yaml.tpl
+++ b/docker/thirdparties/docker-compose/mariadb/mariadb-10.yaml.tpl
@@ -39,11 +39,17 @@ 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
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..1845bfa4ec1 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
diff --git a/docker/thirdparties/docker-compose/oracle/oracle-11.yaml.tpl
b/docker/thirdparties/docker-compose/oracle/oracle-11.yaml.tpl
index 448b009170b..9a1dc15da6c 100644
--- a/docker/thirdparties/docker-compose/oracle/oracle-11.yaml.tpl
+++ b/docker/thirdparties/docker-compose/oracle/oracle-11.yaml.tpl
@@ -39,11 +39,17 @@ 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
diff --git
a/docker/thirdparties/docker-compose/postgresql/postgresql-14.yaml.tpl
b/docker/thirdparties/docker-compose/postgresql/postgresql-14.yaml.tpl
index ae63c2b9bda..ebc8ed185fa 100644
--- a/docker/thirdparties/docker-compose/postgresql/postgresql-14.yaml.tpl
+++ b/docker/thirdparties/docker-compose/postgresql/postgresql-14.yaml.tpl
@@ -35,10 +35,17 @@ 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
+ condition: service_healthy
+ networks:
+ - doris--postgres
+
networks:
doris--postgres:
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.41.0.0/24
diff --git a/docker/thirdparties/docker-compose/sqlserver/sqlserver.yaml.tpl
b/docker/thirdparties/docker-compose/sqlserver/sqlserver.yaml.tpl
index 04b5eb976e6..e338606de6b 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
diff --git a/docker/thirdparties/docker-compose/trino/trino_hive.yaml.tpl
b/docker/thirdparties/docker-compose/trino/trino_hive.yaml.tpl
index f034a0c7bda..e99ecadab83 100644
--- a/docker/thirdparties/docker-compose/trino/trino_hive.yaml.tpl
+++ b/docker/thirdparties/docker-compose/trino/trino_hive.yaml.tpl
@@ -19,7 +19,10 @@ version: "3.8"
networks:
doris--network:
- driver: bridge
+ ipam:
+ driver: default
+ config:
+ - subnet: 168.43.0.0/24
services:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
