diff --git a/compose/README.md b/compose/README.md deleted file mode 100644 index 08de5af..0000000 --- a/compose/README.md +++ /dev/null @@ -1 +0,0 @@ -此目录是docker-compose.yml文件目录,为了启动相关docker容器 \ No newline at end of file diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index f5ed109..7d192e6 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -48,7 +48,7 @@ services: webproc --config /etc/dnsmasq.conf -- dnsmasq --no-daemon & tail -f /dev/null - unittest_client: + client: image: "dign-client:latest" container_name: "dign-client" depends_on: @@ -71,7 +71,8 @@ services: - /bin/sh - -c - | - /root/unittest/wait-for 192.51.100.2:443 -t 60 -- echo "badssl is up" + /root/unittest/wait-for 192.51.100.2:443 -t 60 -- echo "server web is up" + /root/unittest/wait-for 192.51.100.5:8080 -t 60 -- echo "server dns is up" ifconfig eth0 hw ether 02:42:C0:A8:FD:03 arp -i eth0 -s 192.0.2.130 02:42:c0:a8:fd:82 arp -i eth0 -s 192.0.2.131 02:42:C0:A8:FD:83