From b43745a11eea8c1de5bbf5f742d5b4e769054c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=85=A7=E4=BA=AE=E7=85=A7=E4=BA=AE?= <44987534+zlaiyyf@users.noreply.github.com> Date: Sun, 11 Oct 2020 15:20:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=BA=90=E5=92=8C=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-support/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-support/Dockerfile b/docker-support/Dockerfile index 4eeb2fb..4076955 100644 --- a/docker-support/Dockerfile +++ b/docker-support/Dockerfile @@ -3,6 +3,10 @@ WORKDIR /app COPY ./requirements.txt . +RUN echo "https://mirror.tuna.tsinghua.edu.cn/alpine/v3.11/main" > /etc/apk/repositories \ +&& echo "https://mirror.tuna.tsinghua.edu.cn/alpine/v3.11/community" >> /etc/apk/repositories \ +&& echo "https://mirror.tuna.tsinghua.edu.cn/alpine/edge/testing" >> /etc/apk/repositories + RUN apk --update --no-cache add python3 py3-pip py-gunicorn nginx mariadb-connector-c \ && apk --update --no-cache add --virtual .build-deps \ tzdata \ @@ -22,9 +26,9 @@ RUN apk --update --no-cache add python3 py3-pip py-gunicorn nginx mariadb-connec tcl-dev \ harfbuzz-dev \ fribidi-dev \ - && pip3 install --upgrade pip setuptools gevent \ + && pip3 install --upgrade pip \ && mkdir -p /run/nginx \ - && pip3 install -r requirements.txt \ + && pip3 install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple \ && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo "Asia/Shanghai" > /etc/timezone \ && apk del .build-deps @@ -62,4 +66,4 @@ ENV DJANGO_WXADMIN_PASSWORD DJANGO_BLOG_CHANGE_ME ENV DJANGO_WEROBOT_TOKEN DJANGO_BLOG_CHANGE_ME EXPOSE 80 -ENTRYPOINT ["./docker-support/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["sh","./docker-support/entrypoint.sh"] From 4d3320917621debeb769195ed262db4a55e23689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=85=A7=E4=BA=AE=E7=85=A7=E4=BA=AE?= <44987534+zlaiyyf@users.noreply.github.com> Date: Sun, 11 Oct 2020 15:24:03 +0800 Subject: [PATCH 2/4] Update README.md --- docker-support/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-support/README.md b/docker-support/README.md index b858e2a..92c36e1 100644 --- a/docker-support/README.md +++ b/docker-support/README.md @@ -24,6 +24,7 @@ docker build -f .\docker-support\Dockerfile -t <你的 Docker Hub 用户名>/dja ```shell script docker run -it --rm <你的 Docker Hub 用户名>/django_blog:latest <指令> ``` +##### DJANGO_MYSQL_HOST获取:宿主机输入 ifconfig 中的docker0的inet addr 例如: @@ -54,4 +55,4 @@ docker run -it --rm -e DJANGO_MYSQL_HOST=192.168.231.50 django_blog/django_blog: | DJANGO_EMAIL_USER | SMTP_USER_CHANGE_ME | | | DJANGO_EMAIL_PASSWORD | SMTP_PASSWORD_CHANGE_ME | | | DJANGO_ADMIN_EMAIL | admin@example.org | | -| DJANGO_WEROBOT_TOKEN | DJANGO_BLOG_CHANGE_ME | 请使用自己的微信公众号通信令牌(Token) | \ No newline at end of file +| DJANGO_WEROBOT_TOKEN | DJANGO_BLOG_CHANGE_ME | 请使用自己的微信公众号通信令牌(Token) | From 66c60953e648faee5edaf49d0e793f426cd28169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=85=A7=E4=BA=AE=E7=85=A7=E4=BA=AE?= <44987534+zlaiyyf@users.noreply.github.com> Date: Sun, 11 Oct 2020 15:36:58 +0800 Subject: [PATCH 3/4] Update README.md --- docker-support/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-support/README.md b/docker-support/README.md index 92c36e1..c3beec8 100644 --- a/docker-support/README.md +++ b/docker-support/README.md @@ -24,7 +24,7 @@ docker build -f .\docker-support\Dockerfile -t <你的 Docker Hub 用户名>/dja ```shell script docker run -it --rm <你的 Docker Hub 用户名>/django_blog:latest <指令> ``` -##### DJANGO_MYSQL_HOST获取:宿主机输入 ifconfig 中的docker0的inet addr +### DJANGO_MYSQL_HOST获取:宿主机输入 ifconfig 中的docker0的inet addr 例如: From ccb67c9f08a9b6b8ca65828fece34cda89135187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=85=A7=E4=BA=AE=E7=85=A7=E4=BA=AE?= <44987534+zlaiyyf@users.noreply.github.com> Date: Sun, 11 Oct 2020 15:47:46 +0800 Subject: [PATCH 4/4] Update requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b7fbc56..2c3a654 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,3 +36,4 @@ requests==2.24.0 rjsmin==1.1.0 WeRoBot==1.12.0 Whoosh==2.7.4 +gevent==1.4.0