From ef17aa3d59acd7695f223e6e0ae97d0f75eaf42c Mon Sep 17 00:00:00 2001 From: hjdhnx Date: Fri, 9 Sep 2022 21:19:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E4=BA=BA=E4=BA=86,dockerhub=E6=B2=A1?= =?UTF-8?q?=E6=B3=95push?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/amd64_dockerfile.txt | 11 ++++++++--- docker/arm64_dockerfile.txt | 6 +++--- docker/armv7_dockerfile.txt | 6 +++--- docker/merge.sh | 8 ++++---- js/version.txt | 2 +- readme.md | 7 ++++--- ...46\220\255\345\273\272\350\257\264\346\230\216.md" | 2 +- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/docker/amd64_dockerfile.txt b/docker/amd64_dockerfile.txt index 966a58f..cb8ad12 100644 --- a/docker/amd64_dockerfile.txt +++ b/docker/amd64_dockerfile.txt @@ -11,7 +11,12 @@ COPY . /root/sd/pywork/dr_py # 设置语言支持中文打印 # ENV LANG C.UTF-8 # ENV LC_ALL C.UTF-8 -# docker build -f amd64_dockerfile.txt -t hjdhnx/drpy:amd64-v3.2.1 . -# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.2.1 -# docker push hjdhnx/drpy:amd64-v3.2.1 +# cd /ect/docker vi daemon.json +# "https://6kx4zyno.mirror.aliyuncs.com" +# vi /etc/resolv.conf 加了两行也不行?? +# systemctl daemon-reload +# systemctl restart docker +# docker build -f amd64_dockerfile.txt -t hjdhnx/drpy:amd64-v3.4.1 . +# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:amd64-v3.4.1 +# docker push hjdhnx/drpy:amd64-v3.4.1 CMD supervisord -c /root/sd/pywork/dr_py/super/flask.conf && /bin/bash \ No newline at end of file diff --git a/docker/arm64_dockerfile.txt b/docker/arm64_dockerfile.txt index e20fb7f..d10f4cc 100644 --- a/docker/arm64_dockerfile.txt +++ b/docker/arm64_dockerfile.txt @@ -11,7 +11,7 @@ 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.2.1 --push . -# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:arm64-v3.2.1 -# docker push hjdhnx/drpy:arm64-v3.2.1 +# docker buildx build --platform linux/arm64 -f arm64_dockerfile.txt -t hjdhnx/drpy:arm64-v3.4.1 --push . +# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:arm64-v3.4.1 +# docker push hjdhnx/drpy:arm64-v3.4.1 CMD supervisord -c /root/sd/pywork/dr_py/super/flask.conf && /bin/bash \ No newline at end of file diff --git a/docker/armv7_dockerfile.txt b/docker/armv7_dockerfile.txt index 10918fd..8a5e10a 100644 --- a/docker/armv7_dockerfile.txt +++ b/docker/armv7_dockerfile.txt @@ -11,7 +11,7 @@ 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.2.1 --push . -# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:armv7-v3.2.1 -# docker push hjdhnx/drpy:armv7-v3.2.1 +# docker buildx build --platform linux/arm/v7 -f armv7_dockerfile.txt -t hjdhnx/drpy:armv7-v3.4.1 --push . +# docker run -it -p 5705:5705 -p 9001:9001 --restart=always --name drpy -d hjdhnx/drpy:armv7-v3.4.1 +# docker push hjdhnx/drpy:armv7-v3.4.1 CMD supervisord -c /root/sd/pywork/dr_py/super/flask.conf && /bin/bash \ No newline at end of file diff --git a/docker/merge.sh b/docker/merge.sh index e450563..777be44 100644 --- a/docker/merge.sh +++ b/docker/merge.sh @@ -1,9 +1,9 @@ #!/bin/bash #kill -9 $(cat supervisord.pid) # 杀掉进程 -docker manifest create hjdhnx/drpy hjdhnx/drpy:amd64-v3.2.1 hjdhnx/drpy:arm64-v3.2.1 hjdhnx/drpy:armv7-v3.2.1 -docker manifest annotate hjdhnx/drpy hjdhnx/drpy:amd64-v3.2.1 --os linux --arch amd64 -docker manifest annotate hjdhnx/drpy hjdhnx/drpy:arm64-v3.2.1 --os linux --arch arm64/v8 -docker manifest annotate hjdhnx/drpy hjdhnx/drpy:armv7-v3.2.1 --os linux --arch arm/v7 +docker manifest create hjdhnx/drpy hjdhnx/drpy:amd64-v3.4.1 hjdhnx/drpy:arm64-v3.4.1 hjdhnx/drpy:armv7-v3.4.1 +docker manifest annotate hjdhnx/drpy hjdhnx/drpy:amd64-v3.4.1 --os linux --arch amd64 +docker manifest annotate hjdhnx/drpy hjdhnx/drpy:arm64-v3.4.1 --os linux --arch arm64/v8 +docker manifest annotate hjdhnx/drpy hjdhnx/drpy:armv7-v3.4.1 --os linux --arch arm/v7 docker manifest push hjdhnx/drpy # 保留一个 bash #/bin/bash \ No newline at end of file diff --git a/js/version.txt b/js/version.txt index fbcbf73..8cf6caf 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.4.0 \ No newline at end of file +3.4.1 \ No newline at end of file diff --git a/readme.md b/readme.md index 2b4cf54..f6f2ebc 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ logo

🗂️A webServer convert web and x5 movie sites to cms api data

- latest version + latest version discussions @@ -15,8 +15,8 @@ - - Downloads + + Downloads @@ -48,6 +48,7 @@ [获取本地设备信息](https://m.jb51.net/article/140716.htm) ###### 2022/09/09 - [X] 1.增加西瓜源,修复一级不支持lazy的bug +- [X] 2.兄弟们dockerhub没法push镜像不知道咋回事,3.4.1的镜像自己用docker目录下的文件build吧 ###### 2022/09/08 - [X] 1.升级到3.2.9,支持自动合并自定义用户配置(内置t4测试源) - [X] 2.升级到3.3.0,增加奇珍异兽源 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 411d730..90b5de3 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/iEfIW0b6vgza) +[蓝奏云下载](https://wwi.lanzoup.com/iZgFJ0bdf7ob) ##### 三架构自动识别(测试功能) ```shell -- GitLab