Skip to content

Commit

Permalink
[enhance](regression) enhance docker network by add network subnet (a…
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangguoqiang666 authored Nov 14, 2023
1 parent da732e5 commit 1edeacd
Show file tree
Hide file tree
Showing 11 changed files with 84 additions and 35 deletions.
36 changes: 18 additions & 18 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 5 additions & 1 deletion docker/thirdparties/docker-compose/elasticsearch/es.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,8 @@ services:
- doris--es

networks:
doris--es:
doris--es:
ipam:
driver: default
config:
- subnet: 168.36.0.0/24
5 changes: 4 additions & 1 deletion docker/thirdparties/docker-compose/hudi/hudi.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ version: "3.3"

networks:
doris--hudi:
driver: bridge
ipam:
driver: default
config:
- subnet: 168.37.0.0/24

services:

Expand Down
4 changes: 4 additions & 0 deletions docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,7 @@ services:
"
networks:
doris--iceberg:
ipam:
driver: default
config:
- subnet: 168.38.0.0/24
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions docker/thirdparties/docker-compose/mysql/mysql-5.7.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 7 additions & 1 deletion docker/thirdparties/docker-compose/oracle/oracle-11.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 11 additions & 6 deletions docker/thirdparties/docker-compose/sqlserver/sqlserver.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion docker/thirdparties/docker-compose/trino/trino_hive.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ version: "3.8"

networks:
doris--network:
driver: bridge
ipam:
driver: default
config:
- subnet: 168.43.0.0/24

services:

Expand Down

0 comments on commit 1edeacd

Please sign in to comment.