refactor:优化docker-compose.yml中容器,网络,service的命名

This commit is contained in:
fumingwei
2021-09-01 17:35:03 +08:00
parent 2c82da97ca
commit 038aa7471d

View File

@@ -2,16 +2,16 @@
version: '2.2'
services:
badssl_server:
server_web:
image: "dign-server-web:latest"
container_name: "badssl_tsg-diagnose"
container_name: "dign-server-web"
tty: true
privileged: true
networks:
vlan_ssl_net:
server_macvlan_net:
ipv4_address: 192.0.2.130
ipv6_address: fd00:a1bf:2c3d:ef5a:1e2f:3d4c:56ab:1010
bridge_net:
bridge_direct_net:
ipv4_address: 192.51.100.2
volumes:
- /opt/tsg/tsg-diagnose/.badssl_cert_dict:/badssl.com/unittest_certs
@@ -25,16 +25,16 @@ services:
&& tail -f /dev/null"
dns_server:
server_dns:
image: "dign-server-dns:latest"
container_name: "dign-server-dns"
tty: true
privileged: true
networks:
vlan_ssl_net:
server_macvlan_net:
ipv4_address: 192.0.2.135
ipv6_address: fd00:a1bf:2c3d:ef5a:1e2f:3d4c:56ab:1015
bridge_net:
bridge_direct_net:
ipv4_address: 192.51.100.5
volumes:
- /etc/localtime:/etc/localtime:ro
@@ -50,17 +50,17 @@ services:
unittest_client:
image: "dign-client:latest"
container_name: "unittest_tsg-diagnose"
container_name: "dign-client"
depends_on:
- badssl_server
- dns_server
- server_web
- server_dns
tty: true
privileged: true
networks:
vlan_unittest_net:
client_macvlan_net:
ipv4_address: 192.0.2.3
ipv6_address: fd00:a1bf:2c3d:ef5b:6e7f:8d9c:abfe:1012
bridge_net:
bridge_direct_net:
ipv4_address: 192.51.100.4
volumes:
- /opt/tsg/tsg-diagnose/.badssl_cert_dict:/root/cafile_dict
@@ -89,16 +89,16 @@ services:
networks:
bridge_net:
name: bridge_tsg-diagnose_net
bridge_direct_net:
name: dign-direct-bridge
driver: bridge
ipam:
config:
- subnet: 192.51.100.0/24
gateway: 192.51.100.1
vlan_ssl_net:
name: vlan_tsg-diagnose_net
server_macvlan_net:
name: dign-server-macvlan
driver: macvlan
enable_ipv6: true
driver_opts:
@@ -112,8 +112,8 @@ networks:
ip_range: fd00:a1bf:2c3d:ef5a::/64
gateway: fd00:a1bf:2c3d:ef5a::1010
vlan_unittest_net:
name: vlan_unittest_tsg-diagnose_net
client_macvlan_net:
name: dign-client-macvlan
driver: macvlan
enable_ipv6: true
driver_opts: