Skip to content

My branch #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gaohuadong2001 wants to merge 25 commits into
base: master
Choose a base branch
from
Open

My branch #111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
18a5f4e
获取元宇宙板块新闻，输出到excel
gaohuadong Dec 22, 2021
62f3c1d
无
gaohuadong Dec 22, 2021
cac224f
从akshare获取板块列表
gaohuadong Dec 23, 2021
92e4ce7
修改excel路径
gaohuadong Dec 23, 2021
63722fd
无
gaohuadong Dec 24, 2021
084d20d
增加jupyter
gaohuadong Jan 1, 2022
eeb55bb
akshare推荐使用python3.8，升级 python3.7 to 3.8
gaohuadong Jan 2, 2022
100b329
升级python3.8后,需要同步升级bokeh
gaohuadong Jan 2, 2022
a963178
增加自启动supervisor,镜像启动后首先启动supervisor
gaohuadong Jan 2, 2022
ab5b497
删除mysqlclient 安装编译工具，缩小镜像
gaohuadong Jan 3, 2022
56a69f8
a mistake
gaohuadong Jan 3, 2022
80b16fa
整理image制作
gaohuadong Jan 3, 2022
da4673c
无
gaohuadong Jan 12, 2022
40ea5ac
Merge branch 'master' of https://github.com/gaohuadong2001/stock
gaohuadong Jan 12, 2022
6d5503e
Merge branch 'master' of https://github.com/gaohuadong2001/stock
gaohuadong Jan 15, 2022
2426273
转unix码
gaohuadong Jan 15, 2022
2bec375
增加元宇宙新闻
gaohuadong Jan 16, 2022
2aa29ae
取消jupyter密码
gaohuadong Jan 17, 2022
6676c6c
无
gaohuadong Jan 17, 2022
dad9a7b
添加概念列表
gaohuadong Jan 20, 2022
e5dc63a
调整newHomeHandler
gaohuadong Jan 20, 2022
e0ec218
调整homepage
gaohuadong Jan 20, 2022
892f20e
修改链接
gaohuadong Jan 20, 2022
4e44150
vnpy docker 配置
gaohuadong Jan 26, 2022
bba2cc4
vnpy docker 制作
gaohuadong Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
a mistake
  • Loading branch information
@gaohuadong
gaohuadong committed Jan 3, 2022
commit 56a69f8e325fef9ac4298420f44fd41460abad31
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN apt-get update
RUN apt-get install --assume-yes apt-utils

RUN apt-get install -y net-tools procps gcc make default-libmysqlclient-dev cron && \
pip3 install mysqlclient
pip3 install mysqlclient && \
apt-get --purge remove -y gcc make default-libmysqlclient-dev && \
pip3 install supervisor sqlalchemy && \
pip3 install numpy pandas && \
Expand Down
4 changes: 2 additions & 2 deletions startStock.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ if [ $# == 1 ] ; then
-v ${PWD}/supervisor:/data/supervisor \
-v ${PWD}/notebooks:/data/notebooks \
-v ${PWD}/data/logs:/data/logs \
pythonstock/pythonstock:base-2022-01 \
pythonstock/pythonstock:2022-01 \
supervisord -n -c /data/supervisor/supervisord.conf
exit 1;
else
echo "############# run online ############# "
# /data/stock 是代码目录 -v /data/stock:/data/stock 是开发模式。
docker run -itd --link=mysqldb --name stock \
-p 8888:8888 -p 9999:9999 --restart=always \
pythonstock/pythonstock:base-2022-01
pythonstock/pythonstock:2022-01
exit 1;
fi