Merge pull request #73 from boy-hack/master

更新dockerfile

Dockerfile

@@ -1,13 +1,15 @@
 FROM python:3.8-alpine3.10
-
 MAINTAINER milktea@vmoe.info
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-#RUN apk --no-cache add git
-RUN apk --no-cache add git build-base libffi-dev libxml2-dev libxslt-dev libressl-dev
-RUN git clone https://github.com/shmilylty/OneForAll
-RUN pip install -r /OneForAll/requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
+RUN apk update && apk --no-cache add git build-base libffi-dev libxml2-dev libxslt-dev libressl-dev
+ADD requirements.txt /requirements.txt
+RUN pip install -r /requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
+RUN git clone https://github.com/blechschmidt/massdns
+WORKDIR /massdns
+RUN make 
+ADD . /OneForAll/
+RUN mv /massdns/bin/massdns /OneForAll/oneforall/thirdparty/massdns/massdns_linux_x86_64
+WORKDIR /OneForAll/oneforall
 
-WORKDIR /OneForAll
-
-ENTRYPOINT ["/bin/ash"]
+ENTRYPOINT ["/bin/ash"]

README.md

@@ -122,8 +122,9 @@ docker run -it oneforall
 
 ```shell
 docker build -t oneforall .
-docker run -it oneforall
+docker run -it --rm -v ~/results:/OneForAll/oneforall/results oneforall
 ```
+结果会输出在本地目录`~/results`
 
 **✨使用演示**
 

oneforall/common/utils.py

@@ -515,8 +515,8 @@ def call_massdns(massdns_path, dict_path, ns_path, output_path, log_path,
           f'--processes {process_num} --socket-count {socket_num} ' \
           f'--hashmap-size {concurrent_num} --resolvers {ns_path} ' \
           f'--resolve-count {resolve_num} --type {query_type} ' \
-          f'--flush --output J --outfile {output_path} --drop-group ' \
-          f'--drop-user --error-log {log_path} {dict_path}'
+          f'--flush --output J --outfile {output_path} ' \
+          f'--error-log {log_path} {dict_path}'
     logger.log('INFOR', f'执行命令 {cmd}')
     subprocess.run(args=cmd, shell=True)
     logger.log('INFOR', f'结束执行massdns')