diff options
| author | fumingwei <[email protected]> | 2021-09-02 14:54:16 +0800 |
|---|---|---|
| committer | fumingwei <[email protected]> | 2021-09-02 14:54:16 +0800 |
| commit | 5a291e32ca16420180ac04291e54b6ce5d5cad14 (patch) | |
| tree | 081ae9d0943bd173f5c9364427de123bd6c8afa8 | |
| parent | 47575d9020a0b97128a5fb7e0f1968008e93c6bb (diff) | |
refactor:修改导入badssl相关证书的目录,将宿主机上的dnsmasq.conf和client.conf挂在相应的容器中
| -rw-r--r-- | compose/docker-compose.yml | 15 | ||||
| -rw-r--r-- | images_build/server_web/Dockerfile | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index d304d72..8c94a43 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -14,12 +14,13 @@ services: bridge_direct_net:
ipv4_address: 192.51.100.2
volumes:
- - /opt/tsg/tsg-diagnose/.badssl_cert_dict:/badssl.com/unittest_certs
+ - /opt/tsg/tsg-diagnose/etc/.certs_import:/badssl.com/certs_import
- /etc/localtime:/etc/localtime:ro
+ - /etc/timezone:/etc/timezone:ro
command: >
bash -c "ifconfig eth0 hw ether 02:42:c0:a8:fd:82
&& arp -i eth0 -s 192.0.2.3 02:42:C0:A8:FD:03
- && cp -r /badssl.com/unittest_certs/certs /badssl.com/unittest_certs/common /badssl.com
+ && cp -r /badssl.com/certs_import/certs /badssl.com/certs_import/common /badssl.com
&& make inside-docker
&& nginx
&& tail -f /dev/null"
@@ -37,7 +38,9 @@ services: bridge_direct_net:
ipv4_address: 192.51.100.5
volumes:
+ - /opt/tsg/tsg-diagnose/etc/dnsmasq.conf:/etc/dnsmasq.conf
- /etc/localtime:/etc/localtime:ro
+ - /etc/timezone:/etc/timezone:ro
entrypoint: /bin/sh
command:
- -c
@@ -63,10 +66,11 @@ services: bridge_direct_net:
ipv4_address: 192.51.100.4
volumes:
- - /opt/tsg/tsg-diagnose/.badssl_cert_dict:/root/cafile_dict
+ - /opt/tsg/tsg-diagnose/etc/.certs_import:/opt/dign_client/etc/certs_import
- /opt/tsg/tsg-diagnose/log:/opt/dign_client/log
- - /opt/tsg/tsg-diagnose/etc:/root/etc_tsg_diagnose
+ - /opt/tsg/tsg-diagnose/etc/client.conf:/opt/dign_client/etc/client.conf
- /etc/localtime:/etc/localtime:ro
+ - /etc/timezone:/etc/timezone:ro
command:
- /bin/sh
- -c
@@ -79,13 +83,12 @@ services: arp -i eth0 -s 192.0.2.135 02:42:C0:A8:FD:85
mkdir -p /opt/dign_client/log/dign_client
mkdir -p /opt/dign_client/log/conn_traffic_status
- cp -rf /root/cafile_dict/certs/sets/current/gen/crt/ca-root.crt /usr/local/share/ca-certificates
+ cp -rf /opt/dign_client/etc/certs_import/certs/sets/current/gen/crt/ca-root.crt /usr/local/share/ca-certificates
update-ca-certificates
cat /opt/dign_client/etc/hosts >> /etc/hosts
echo '0 2 * * * /usr/local/bin/python /opt/dign_client/clear_file_timeout.py' > /etc/crontabs/root
echo '0 2 * * * /usr/local/bin/python /opt/dign_client/clear_file_timeout.py -d /opt/dign_client/log/conn_traffic_status' > /etc/crontabs/root
crond
- python /opt/dign_client/tsg_diagnose.py -l -w NEZHA
tail -f /dev/null
diff --git a/images_build/server_web/Dockerfile b/images_build/server_web/Dockerfile index 9b9d0cb..9d4d056 100644 --- a/images_build/server_web/Dockerfile +++ b/images_build/server_web/Dockerfile @@ -1,6 +1,6 @@ # Start with Ubuntu 16.04 (LTS), and build badssl.com up from there FROM ubuntu:16.04 -MAINTAINER April King <[email protected]> +MAINTAINER TSG RUN sed -i s@/archive.ubuntu.com/@/mirrors.163.com/@g /etc/apt/sources.list \ && apt-get clean \ |