river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-08-26 12:57:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from boy-hack/master

Browse Source 
更新dockerfile
This commit is contained in:
Jing Ling
2020-04-26 22:12:43 +08:00
committed by GitHub
parent 433ad720a2 55326f01db
commit e76b2d039c
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+9 -7
View File
@@ -1,13 +1,15 @@
FROM python:3.8-alpine3.10 FROM python:3.8-alpine3.10
MAINTAINER milktea@vmoe.info MAINTAINER milktea@vmoe.info
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
#RUN apk --no-cache add git RUN apk update && apk --no-cache add git build-base libffi-dev libxml2-dev libxslt-dev libressl-dev
RUN apk --no-cache add git build-base libffi-dev libxml2-dev libxslt-dev libressl-dev ADD requirements.txt /requirements.txt
RUN git clone https://github.com/shmilylty/OneForAll RUN pip install -r /requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
RUN pip install -r /OneForAll/requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple RUN git clone https://github.com/blechschmidt/massdns
WORKDIR /massdns
WORKDIR /OneForAll RUN make
ADD . /OneForAll/
RUN mv /massdns/bin/massdns /OneForAll/oneforall/thirdparty/massdns/massdns_linux_x86_64
WORKDIR /OneForAll/oneforall
ENTRYPOINT ["/bin/ash"] ENTRYPOINT ["/bin/ash"]
README.md
+2 -1
View File
@@ -122,8 +122,9 @@ docker run -it oneforall
```shell ```shell
docker build -t oneforall . docker build -t oneforall .
docker run -it oneforall docker run -it --rm -v ~/results:/OneForAll/oneforall/results oneforall
``` ```
结果会输出在本地目录`~/results`
**✨使用演示** **✨使用演示**
oneforall/common/utils.py
+2 -2
View File
@@ -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'--processes {process_num} --socket-count {socket_num} ' \
f'--hashmap-size {concurrent_num} --resolvers {ns_path} ' \ f'--hashmap-size {concurrent_num} --resolvers {ns_path} ' \
f'--resolve-count {resolve_num} --type {query_type} ' \ f'--resolve-count {resolve_num} --type {query_type} ' \
f'--flush --output J --outfile {output_path} --drop-group ' \ f'--flush --output J --outfile {output_path} ' \
f'--drop-user --error-log {log_path} {dict_path}' f'--error-log {log_path} {dict_path}'
logger.log('INFOR', f'执行命令 {cmd}') logger.log('INFOR', f'执行命令 {cmd}')
subprocess.run(args=cmd, shell=True) subprocess.run(args=cmd, shell=True)
logger.log('INFOR', f'结束执行massdns') logger.log('INFOR', f'结束执行massdns')