From 73d7ae3588b8b0645f636cb99e6468cd2705dca9 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Thu, 3 Jan 2019 17:02:09 +0800 Subject: [PATCH 01/12] add docker-compose file --- docker-compose.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..195c8d2 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: "3" + +services: + 12306ticket: + # image: + build: . + # ports: + volumes: + - ./:/usr/src/app + container_name: 12306ticket + + From 7518d21c60ec6c9af19ed4672f38817c7184aca0 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Mon, 7 Jan 2019 15:21:42 +0800 Subject: [PATCH 02/12] update docker files --- Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17fd237..555a1eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,5 +9,5 @@ RUN pip install --no-cache-dir -r requirements.txt #EXPOSE 5010 -WORKDIR /usr/src/app/ +#WORKDIR /usr/src/app/ CMD [ "python", "run.py" ] diff --git a/docker-compose.yml b/docker-compose.yml index 195c8d2..f7b01ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - 12306ticket: + ticket: # image: build: . # ports: From 8c548f13de7c880de066e4ecfff8e9b1dec6d911 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Mon, 7 Jan 2019 16:44:12 +0800 Subject: [PATCH 03/12] modify some config about compose file. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f7b01ee..f1e678c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: ticket: - # image: + image: 12306_ticket build: . # ports: volumes: From 8c2686273232f30a6206644c2a8a531ff48cb211 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Mon, 7 Jan 2019 16:44:36 +0800 Subject: [PATCH 04/12] add docker.sh file to control compose file --- docker.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 docker.sh diff --git a/docker.sh b/docker.sh new file mode 100755 index 0000000..c65e895 --- /dev/null +++ b/docker.sh @@ -0,0 +1,32 @@ +#!/bin/bash +#author: tan +#date: 2019-01-07 +# a script to control docker's container create restart reload and rm function + +function checkSudo (){ + if [ $UID -ne 0 ];then + echo -e 'it must be root!' + echo -e 'usage ./docker.sh {run|restart|rm}' + exit 1 + fi +} + +checkSudo + +if [ $# -eq 1 ];then + + case $1 in + "run") + echo "run";; + + "restart") + echo "restart";; + + "rm") + echo "rm";; + + *) + echo -e 'usage ./docker.sh {run|restart|rm}';; + esac + +fi From fe1ea37a7eb5646e54a77cdee711abf0b5da4da7 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Mon, 7 Jan 2019 17:02:35 +0800 Subject: [PATCH 05/12] complete docker script --- docker.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docker.sh b/docker.sh index c65e895..dbeb49e 100755 --- a/docker.sh +++ b/docker.sh @@ -17,14 +17,17 @@ if [ $# -eq 1 ];then case $1 in "run") - echo "run";; + docker-compose up;; "restart") - echo "restart";; + docker-compose up --no-recreate;; "rm") - echo "rm";; - + docker-compose rm -f;; + + "drun") + docker-compose up -d;; + *) echo -e 'usage ./docker.sh {run|restart|rm}';; esac From 9fa568e93b84a16ac043d518cd9bf593963580f1 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Thu, 10 Jan 2019 10:55:20 +0800 Subject: [PATCH 06/12] update Dockerfile file --- Dockerfile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a49deee..7237e0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,20 @@ ADD . /usr/src/app ENV DEBIAN_FRONTEND noninteractive ENV TZ Asia/Shanghai -RUN pip install --no-cache-dir -r requirements.txt + +## install python requirements +RUN pip install -i https://pypi.tuna.tsinghua.edu.cn/simple pyspider --no-cache-dir -r requirements.txt +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +## install ntpdate, not accept but saving code +#RUN echo 'deb http://mirrors.163.com/debian/ jessie main non-free contrib \ +# deb http://mirrors.163.com/debian/ jessie-updates main non-free contrib \ +# deb http://mirrors.163.com/debian-security/ jessie/updates main non-free contrib' > /etc/apt/sources.list \ +# && apt-get update\ +# && apt-get install ntpdate -y \ + #EXPOSE 5010 -#CMD [ "python", "run.py" ] -ENTRYPOINT [ "python", "run.py" ] +CMD [ "python", "run.py" ] +#ENTRYPOINT [ "python", "run.py" ] From f4eb73585afdb13cfbcaace5349b498312e3ec0f Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Thu, 10 Jan 2019 10:55:35 +0800 Subject: [PATCH 07/12] update docker-compose files --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index f1e678c..f570b8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,7 @@ services: # ports: volumes: - ./:/usr/src/app + - /etc/localtime:/etc/localtime:ro container_name: 12306ticket From 8fbb53c6738958c35fc5f01d6383765437004f35 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Thu, 10 Jan 2019 11:17:54 +0800 Subject: [PATCH 08/12] modified readme file for adding docker-compose profile --- README.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 511e25d..acd5268 100755 --- a/README.md +++ b/README.md @@ -20,11 +20,20 @@ - 修改config/ticket_config.yaml文件，按照提示更改自己想要的信息 - 运行根目录sudo python run.py，即可开始 - 由于新增对时功能，请务必用sudo，sudo，sudo 执行，否则会报权限错误，windows打开ide或者cmd请用管理员身份执行python run.py，不需要加sudo - - 如果你的服务器安装了docker，那么就可以docker启动 - - 1、docker build -t dockerticket . + - ~~如果你的服务器安装了docker，那么就可以docker启动 + - 1、~~docker build -t dockerticket . - 2、~~docker run dockerticket python run.py &~~ - 3、~~本来是可以直接Dockerfile启动的，不知道为毛启动不了，如果有大佬看到问题所在，欢迎提出~~ - - 4、docker run -d --name 12306-ticket dockerticket + - 4、~~docker run -d --name 12306-ticket dockerticket + - 如果你的服务器安装了docker与docker-compose, 那么就可以通过`docker-compose`进行启动,`docker.sh`脚本对此进行了封装，可以通过如下命令进行启动 + - 1、`sudo ./docker.sh run` #创建一个镜像并启动容器，如果镜像已经创建过了会直接启动容器。 + - 2、`sudo ./docker.sh reload` #修改配置文件后，通过此名命令可重新加载容器运行 + - 3、`sudo ./docker.sh rm` #删除容器 + - 4、`sudo ./docker.sh drun` #后台运行容器 + - 5、`sudo ./docker.sh logs` #在后台运行时，通过此命令查看运行的内容 + - 注: 若只有docker没有docker-compose. 可通过`pip install docker-compose`进行下载 + + - 目录对应说明 - agency - cdn代理 From a699ff49c99a207fa52df6658ed4dddfc688f6b3 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Thu, 10 Jan 2019 11:18:18 +0800 Subject: [PATCH 09/12] add docker.sh logs function --- docker.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker.sh b/docker.sh index dbeb49e..48e32fb 100755 --- a/docker.sh +++ b/docker.sh @@ -6,7 +6,7 @@ function checkSudo (){ if [ $UID -ne 0 ];then echo -e 'it must be root!' - echo -e 'usage ./docker.sh {run|restart|rm}' + echo -e 'usage ./docker.sh {run|restart|rm|logs}' exit 1 fi } @@ -27,9 +27,11 @@ if [ $# -eq 1 ];then "drun") docker-compose up -d;; + "logs") + docker-compose logs;; *) - echo -e 'usage ./docker.sh {run|restart|rm}';; + echo -e 'usage ./docker.sh {run|restart|rm|logs}';; esac fi From f59eb0ab0c1fa5933f403b53b7e3abb8d9bf484c Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Thu, 10 Jan 2019 11:21:42 +0800 Subject: [PATCH 10/12] update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index acd5268..cd54b6c 100755 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ - 修改config/ticket_config.yaml文件，按照提示更改自己想要的信息 - 运行根目录sudo python run.py，即可开始 - 由于新增对时功能，请务必用sudo，sudo，sudo 执行，否则会报权限错误，windows打开ide或者cmd请用管理员身份执行python run.py，不需要加sudo - - ~~如果你的服务器安装了docker，那么就可以docker启动 - - 1、~~docker build -t dockerticket . + - ~~如果你的服务器安装了docker，那么就可以docker启动~~ + - 1、~~docker build -t dockerticket .~~ - 2、~~docker run dockerticket python run.py &~~ - 3、~~本来是可以直接Dockerfile启动的，不知道为毛启动不了，如果有大佬看到问题所在，欢迎提出~~ - - 4、~~docker run -d --name 12306-ticket dockerticket + - 4、~~docker run -d --name 12306-ticket dockerticket ~~ - 如果你的服务器安装了docker与docker-compose, 那么就可以通过`docker-compose`进行启动,`docker.sh`脚本对此进行了封装，可以通过如下命令进行启动 - 1、`sudo ./docker.sh run` #创建一个镜像并启动容器，如果镜像已经创建过了会直接启动容器。 - 2、`sudo ./docker.sh reload` #修改配置文件后，通过此名命令可重新加载容器运行 From 543cbe34dd129bc01958f264ffe9d72e5d5431e8 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Thu, 10 Jan 2019 11:22:43 +0800 Subject: [PATCH 11/12] update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cd54b6c..6f99cbd 100755 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ - 1、~~docker build -t dockerticket .~~ - 2、~~docker run dockerticket python run.py &~~ - 3、~~本来是可以直接Dockerfile启动的，不知道为毛启动不了，如果有大佬看到问题所在，欢迎提出~~ - - 4、~~docker run -d --name 12306-ticket dockerticket ~~ + - 4、~~docker run -d --name 12306-ticket dockerticket~~ - 如果你的服务器安装了docker与docker-compose, 那么就可以通过`docker-compose`进行启动,`docker.sh`脚本对此进行了封装，可以通过如下命令进行启动 - 1、`sudo ./docker.sh run` #创建一个镜像并启动容器，如果镜像已经创建过了会直接启动容器。 - 2、`sudo ./docker.sh reload` #修改配置文件后，通过此名命令可重新加载容器运行 From 1deb2b2d8aca030d44e927ee7807a32e26a38628 Mon Sep 17 00:00:00 2001 From: tan <447542994@qq.com> Date: Thu, 10 Jan 2019 11:25:14 +0800 Subject: [PATCH 12/12] update readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6f99cbd..db58ead 100755 --- a/README.md +++ b/README.md @@ -20,11 +20,6 @@ - 修改config/ticket_config.yaml文件，按照提示更改自己想要的信息 - 运行根目录sudo python run.py，即可开始 - 由于新增对时功能，请务必用sudo，sudo，sudo 执行，否则会报权限错误，windows打开ide或者cmd请用管理员身份执行python run.py，不需要加sudo - - ~~如果你的服务器安装了docker，那么就可以docker启动~~ - - 1、~~docker build -t dockerticket .~~ - - 2、~~docker run dockerticket python run.py &~~ - - 3、~~本来是可以直接Dockerfile启动的，不知道为毛启动不了，如果有大佬看到问题所在，欢迎提出~~ - - 4、~~docker run -d --name 12306-ticket dockerticket~~ - 如果你的服务器安装了docker与docker-compose, 那么就可以通过`docker-compose`进行启动,`docker.sh`脚本对此进行了封装，可以通过如下命令进行启动 - 1、`sudo ./docker.sh run` #创建一个镜像并启动容器，如果镜像已经创建过了会直接启动容器。 - 2、`sudo ./docker.sh reload` #修改配置文件后，通过此名命令可重新加载容器运行 @@ -32,6 +27,11 @@ - 4、`sudo ./docker.sh drun` #后台运行容器 - 5、`sudo ./docker.sh logs` #在后台运行时，通过此命令查看运行的内容 - 注: 若只有docker没有docker-compose. 可通过`pip install docker-compose`进行下载 + - ~~如果你的服务器安装了docker，那么就可以docker启动~~ + - 1、~~docker build -t dockerticket .~~ + - 2、~~docker run dockerticket python run.py &~~ + - 3、~~本来是可以直接Dockerfile启动的，不知道为毛启动不了，如果有大佬看到问题所在，欢迎提出~~ + - 4、~~docker run -d --name 12306-ticket dockerticket~~