From e5a62a768ded20a713ef633ed780a42fba826e86 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 26 May 2020 14:06:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81badssl=E5=AE=89=E8=A3=85nettools=202?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0docker=E8=BF=90=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E7=9A=84mac=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- badssl.com/Dockerfile | 4 +++- docker-compose/docker-compose.yml | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/badssl.com/Dockerfile b/badssl.com/Dockerfile index ebadf98..906e8bc 100644 --- a/badssl.com/Dockerfile +++ b/badssl.com/Dockerfile @@ -18,6 +18,8 @@ RUN sed -i s@/archive.ubuntu.com/@/mirrors.163.com/@g /etc/apt/sources.list \ nginx \ ruby2.4 \ ruby2.4-dev \ + net-tools \ + iputils-ping \ && gem update --system \ && gem install jekyll @@ -27,4 +29,4 @@ WORKDIR badssl.com RUN make inside-docker # Start things up! -CMD tail -f /dev/null \ No newline at end of file +CMD tail -f /dev/null diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 1257b3a..37997d9 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -17,7 +17,9 @@ services: - /root/.badssl_self_test_cert_dict:/badssl.com/unittest_certs - /etc/localtime:/etc/localtime:ro command: > - bash -c "make clean-certs + bash -c "ifconfig eth0 hw ether 02:42:c0:a8:fd:82 + arp -i eth0 -s 192.168.253.3 02:42:C0:A8:FD:03 + make clean-certs && make certs-test && make inside-docker && cp -r /badssl.com/certs /badssl.com/unittest_certs @@ -42,6 +44,8 @@ services: - /bin/sh - -c - | + ifconfig eth0 hw ether 02:42:C0:A8:FD:83 + arp -i eth0 -s 192.168.253.3 02:42:C0:A8:FD:03 /root/wpr/wpr replay --http_port=80 --https_port=443 --host=0.0.0.0 --quiet_mode /root/wpr/archive.wprgo & tail -f /dev/null @@ -69,6 +73,9 @@ services: - | /root/unittest/wait-for 172.31.254.2:443 -t 60 -- echo "badssl is up" /root/unittest/wait-for 172.31.254.3:443 -t 60 -- echo "wpr is up" + ifconfig eth0 hw ether 02:42:C0:A8:FD:03 + arp -i eth0 -s 192.168.253.130 02:42:c0:a8:fd:82 + arp -i eth0 -s 192.168.253.131 02:42:C0:A8:FD:83 cp -rf /root/cafile_dict/certs/sets/current/gen/crt/ca-root.crt /usr/local/share/ca-certificates update-ca-certificates cat /root/unittest/badssl.test.hosts >> /etc/hosts