From 8e145639828ed8aa8092b039eef0144fdeb5bae2 Mon Sep 17 00:00:00 2001 From: tardis07 Date: Sat, 18 Jul 2020 14:54:36 +0800 Subject: [PATCH] modify the usage of docker version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了uvloop下载源 - 修改Dockerfile中的入口 - 修改了README中docker版的使用说明 --- Dockerfile | 5 +++-- README.md | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 09b0520..6e6b3e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,13 +4,14 @@ MAINTAINER milktea@vmoe.info RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories 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 uvloop +RUN pip install uvloop -i https://mirrors.aliyun.com/pypi/simple/ RUN pip install -r /requirements.txt -i https://mirrors.aliyun.com/pypi/simple/ RUN git clone https://github.com/blechschmidt/massdns WORKDIR /massdns RUN make ADD . /OneForAll/ RUN mv /massdns/bin/massdns /OneForAll/thirdparty/massdns/massdns_linux_x86_64 +RUN mkdir /OneForAll/results WORKDIR /OneForAll/ -ENTRYPOINT ["/bin/ash"] \ No newline at end of file +ENTRYPOINT ["python", "oneforall.py"] \ No newline at end of file diff --git a/README.md b/README.md index 613b26d..fe367d0 100644 --- a/README.md +++ b/README.md @@ -68,11 +68,22 @@ git pull **✔安装步骤(docker 版)** +首先下载并编辑配置文件,添加自己的`api`和个性化设置,并保留原始文件结构 + +``` +config +├── api.py +├── log.py +└── setting.py +``` + +拉取镜像并执行,其中`~/.config`替换为你自己配置文件所在文件夹的路径 + ```shell docker pull shmilylty/oneforall -docker run -it --rm -v ~/results:/OneForAll/results oneforall +docker run -it --rm -v ~/results:/OneForAll/results -v ~/.config:/OneForAll/config oneforall --target example.com run ``` -结果会输出在本地目录`~/results` +参数直接加在指令末尾,结果会输出在本地目录`~/results`,如需保存到其他位置,可以自行修改 **✨使用演示** @@ -241,7 +252,7 @@ FLAGS 7. 常见中文单词拼音和常见英文单词。 8. 从以上获取的字典做优化排序以及脏数据去除处理。 9. 非常欢迎你贡献更好的字典。 - + ## 👏用到框架 * [aiodns](https://github.com/saghul/aiodns) - 简单DNS异步解析库。