From 78ddb2ad3192a948f5537a1079c1eb6917cfe967 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Wed, 21 Sep 2022 16:16:43 +0800
Subject: [PATCH] =?UTF-8?q?docker=E6=9E=84=E5=BB=BA=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B03.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/rules.db                                 | Bin 86016 -> 86016 bytes
 docker/amd64_dockerfile.txt                   |   6 +++---
 docker/arm64_dockerfile.txt                   |   6 +++---
 docker/armv7_dockerfile.txt                   |   6 +++---
 docker/merge.sh                               |   8 ++++----
 readme.md                                     |   6 +++---
 ...55\345\273\272\350\257\264\346\230\216.md" |  12 ++++++------
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/base/rules.db b/base/rules.db
index 7c2910ee4dbacda30081fdfb5bcbcef456510482..ff23620bc58782795960196783a9f6d73e69eeab 100644
GIT binary patch
delta 219
zcmZozz}m2Yb%Hcw=0q81#>|Zgi|RFE83cL1F!OKa<KR=_FXWHmcj4#d`^)!%?*ZRJ
zzCu2GJ|q6QykGc4Hwz|g<YnPwWssbFzgOKdmVujzg+Y=(G}tvhAkvUmkcB~>*U`r_
zKE&VK)sKgng+Z1#z{fE%J~YUOn~#M-nm54H1;m+b-zO)+-@+gQ(#r)hgBN1P<ifsJ
zjE0kA`nB~WWi5ev)l@;I*uzZ85aVZI&=d`JbqsR$h!64fb@dMoF*YzT*u1sh`v3qc
CbT{Jw

delta 219
zcmZozz}m2Yb%Hcw(nJ|&#-xo2i|RF483cK6Gw^Tai{<a*FXWHmcj4#d`^)!%?*ZRJ
zzCu2GK3U$|ykGb@Hwz|g<Yf`(XJMFpzgOKdi-AQ*kcB~B+|kD~KE&VK)z1(F6!=&e
zq|F07UE)K7d@@Q(3as??bMliDb29RaOROvn3=AjR_sNNHGqEs8@`nby#s@?i^0zRs
zD@TS*F6?{7XfQdZUt5n$)-u4yQB9SZg+bOH$cjWV&Ct?F&(O?5&sfjM$i&Lj+`x46
I)_(5;0Ng!0%K!iX

diff --git a/docker/amd64_dockerfile.txt b/docker/amd64_dockerfile.txt
index 90fae94..34e5314 100644
--- a/docker/amd64_dockerfile.txt
+++ b/docker/amd64_dockerfile.txt
@@ -16,9 +16,9 @@ COPY . /root/sd/pywork/dr_py
 #  vi /etc/resolv.conf 加了两行也不行??
 # systemctl daemon-reload
 # systemctl restart docker
-# docker build -f amd64_dockerfile.txt -t hjdhnx/drpy:amd64-v3.6.5 .
-# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.6.5
-# docker push hjdhnx/drpy:amd64-v3.6.5
+# docker build -f amd64_dockerfile.txt -t hjdhnx/drpy:amd64-v3.7.0 .
+# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.7.0
+# docker push hjdhnx/drpy:amd64-v3.7.0
 # docker cp . drpy:/root/sd/pywork/
 # CMD supervisord -c /root/sd/pywork/dr_py/super/flask.conf && /bin/bash
 ENTRYPOINT ["/etc/autostart/app.sh","flask"]
\ No newline at end of file
diff --git a/docker/arm64_dockerfile.txt b/docker/arm64_dockerfile.txt
index 1c4a690..5f182de 100644
--- a/docker/arm64_dockerfile.txt
+++ b/docker/arm64_dockerfile.txt
@@ -11,8 +11,8 @@ COPY . /root/sd/pywork/dr_py
 # 设置语言支持中文打印
 # ENV LANG C.UTF-8
 # ENV LC_ALL C.UTF-8
-# docker buildx build --platform linux/arm64 -f arm64_dockerfile.txt -t hjdhnx/drpy:arm64-v3.6.5 --push .
-# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:arm64-v3.6.5
-# docker push hjdhnx/drpy:arm64-v3.6.5
+# docker buildx build --platform linux/arm64 -f arm64_dockerfile.txt -t hjdhnx/drpy:arm64-v3.7.0 --push .
+# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:arm64-v3.7.0
+# docker push hjdhnx/drpy:arm64-v3.7.0
 # CMD supervisord -c /root/sd/pywork/dr_py/super/flask.conf && /bin/bash
 ENTRYPOINT ["/etc/autostart/app.sh","flask"]
\ No newline at end of file
diff --git a/docker/armv7_dockerfile.txt b/docker/armv7_dockerfile.txt
index 0e9ce3f..f8fb399 100644
--- a/docker/armv7_dockerfile.txt
+++ b/docker/armv7_dockerfile.txt
@@ -11,8 +11,8 @@ COPY . /root/sd/pywork/dr_py
 # 设置语言支持中文打印
 # ENV LANG C.UTF-8
 # ENV LC_ALL C.UTF-8
-# docker buildx build --platform linux/arm/v7 -f armv7_dockerfile.txt -t hjdhnx/drpy:armv7-v3.6.5 --push .
-# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:armv7-v3.6.5
-# docker push hjdhnx/drpy:armv7-v3.6.5
+# docker buildx build --platform linux/arm/v7 -f armv7_dockerfile.txt -t hjdhnx/drpy:armv7-v3.7.0 --push .
+# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:armv7-v3.7.0
+# docker push hjdhnx/drpy:armv7-v3.7.0
 # CMD supervisord -c /root/sd/pywork/dr_py/super/flask.conf && /bin/bash
 ENTRYPOINT ["/etc/autostart/app.sh","flask"]
\ No newline at end of file
diff --git a/docker/merge.sh b/docker/merge.sh
index 85120fa..f22f4ac 100644
--- a/docker/merge.sh
+++ b/docker/merge.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #kill -9 $(cat supervisord.pid) # 杀掉进程
 docker manifest rm hjdhnx/drpy
-docker manifest create hjdhnx/drpy hjdhnx/drpy:amd64-v3.6.5 hjdhnx/drpy:arm64-v3.6.5 hjdhnx/drpy:armv7-v3.6.5
-docker manifest annotate hjdhnx/drpy hjdhnx/drpy:amd64-v3.6.5 --os linux --arch amd64
-docker manifest annotate hjdhnx/drpy hjdhnx/drpy:arm64-v3.6.5 --os linux --arch arm64/v8
-docker manifest annotate hjdhnx/drpy hjdhnx/drpy:armv7-v3.6.5 --os linux --arch arm/v7
+docker manifest create hjdhnx/drpy hjdhnx/drpy:amd64-v3.7.0 hjdhnx/drpy:arm64-v3.7.0 hjdhnx/drpy:armv7-v3.7.0
+docker manifest annotate hjdhnx/drpy hjdhnx/drpy:amd64-v3.7.0 --os linux --arch amd64
+docker manifest annotate hjdhnx/drpy hjdhnx/drpy:arm64-v3.7.0 --os linux --arch arm64/v8
+docker manifest annotate hjdhnx/drpy hjdhnx/drpy:armv7-v3.7.0 --os linux --arch arm/v7
 docker manifest push hjdhnx/drpy
 # 保留一个 bash
 #/bin/bash
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 33c0184..3ebae57 100644
--- a/readme.md
+++ b/readme.md
@@ -4,7 +4,7 @@
   <a href="https://alist.nn.ci"><img height="100px" alt="logo" src="https://gitcode.net/qq_32394351/dr_py/-/raw/1fe0e082b1ceacc4469d7f175a605cc2edf0bab0/static/img/icon.png"/></a>
   <p><em>🗂️A webServer convert web and x5 movie sites to cms api data</em></p>
   <a href="https://gitcode.net/qq_32394351/dr_py/-/releases">
-    <img src="https://img.shields.io/badge/version-3.6.5-blue" alt="latest version" />
+    <img src="https://img.shields.io/badge/version-3.6.15-blue" alt="latest version" />
   </a>
   <a href="https://gitcode.net/qq_32394351/dr_py/-/issues">
     <img src="https://img.shields.io/badge/discussions-2-orange" alt="discussions" />
@@ -15,8 +15,8 @@
   </a>
 
 
-<a href="https://wwi.lanzoup.com/iEwHP0bo1m9i">
-    <img src="https://img.shields.io/badge/蓝奏云下载-3.6.5-blue" alt="Downloads" />
+<a href="https://wwi.lanzoup.com/i02Vp0c3hpkd">
+    <img src="https://img.shields.io/badge/蓝奏云下载-3.7.0-blue" alt="Downloads" />
   </a>
 
 
diff --git "a/\345\256\211\345\215\223\346\234\254\345\234\260\346\220\255\345\273\272\350\257\264\346\230\216.md" "b/\345\256\211\345\215\223\346\234\254\345\234\260\346\220\255\345\273\272\350\257\264\346\230\216.md"
index aa3f43f..e4bb3c4 100644
--- "a/\345\256\211\345\215\223\346\234\254\345\234\260\346\220\255\345\273\272\350\257\264\346\230\216.md"
+++ "b/\345\256\211\345\215\223\346\234\254\345\234\260\346\220\255\345\273\272\350\257\264\346\230\216.md"
@@ -13,7 +13,7 @@ apt install python3
 ##### 特殊-docker直装(支持amd64/armv7/arm64)
 ##### 不知道自己架构的通过arch命令查看
 ###### 可以通过点此下载获得最小必要文件压缩包
-[蓝奏云下载](https://wwi.lanzoup.com/iEwHP0bo1m9i)
+[蓝奏云下载](https://wwi.lanzoup.com/i02Vp0c3hpkd)
 
 ##### 三架构自动识别(测试功能)
 ```shell
@@ -22,15 +22,15 @@ docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/
 
 ##### amd64/x86架构(主流设备)
 ```shell
-docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.6.5
+docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.7.0
 ```
 ##### armv7架构(树莓派,机顶盒,软路由等)
 ```shell
-docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:armv7-v3.6.5
+docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:armv7-v3.7.0
 ```
 ##### arm64架构(部分服务器)
 ```shell
-docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:arm64-v3.6.5
+docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:arm64-v3.7.0
 ```
 
 ##### 上面代码如果成功了下面都可以忽略
@@ -40,10 +40,10 @@ docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/
 ```
 ```shell
 # 运行容器-小白只需要这一条命令(存在问题是不能在远程面板上正确获取配置地址和进程管理地址,但自己知道地址就不影响使用，可进入容器自行修改config)
-docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.6.5
+docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.7.0
 # 稍微懂一点可以运行下面的操作
 先把本项目拷贝到 /home/pywork/dr_py 
-docker run -it -p 5705:5705 -p 9001:9001 -v /home/pywork/dr_py:/root/sd/pywork/dr_py --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.6.5
+docker run -it -p 5705:5705 -p 9001:9001 -v /home/pywork/dr_py:/root/sd/pywork/dr_py --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.7.0
 # 进入容器然后修改config.py文件改配置里面自己的远程地址等信息,改完退出容器再重启容器(或者通过进程管理9001端口在线重启flask服务)
 docker exec -it drpy bash
 vi ./base/config.py
-- 
GitLab