From d23d9a3e495268a74de1159ece24e154f9cae38a Mon Sep 17 00:00:00 2001 From: LiShenshun <47957260+LiShenshun@users.noreply.github.com> Date: Fri, 14 Jul 2023 00:07:14 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20Dockerfile=20and=20README?= =?UTF-8?q?=20(#27)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 新增Docker部署脚本 * 🚨 `pre-commit-ci`修复格式错误 * 修复Docker部署说明 * Optimize Dockerfile * Update Dockerfile * Update README.md * 🚨 `pre-commit-ci`修复格式错误 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- Dockerfile | 2 +- README.md | 15 ++++----------- requirements.txt | 6 ++++++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53ac9bf..e9d501e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN sed -i 's/http:\/\/deb.debian.org/http:\/\/ftp.cn.debian.org/g' /etc/apt/sou && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && pip install --no-cache-dir --upgrade pip -i https://pypi.tuna.tsinghua.edu.cn/simple/ \ && pip install poetry -i https://pypi.tuna.tsinghua.edu.cn/simple/ \ - && poetry install && \ + && poetry install \ && rm -rf /app/* CMD poetry run python3 core.py diff --git a/README.md b/README.md index 3404151..9d54cf0 100644 --- a/README.md +++ b/README.md @@ -65,23 +65,16 @@ poetry run core git clone https://ghproxy.com/https://github.com/Genshin-bots/gsuid_core.git --depth=1 --single-branch ``` -2. 安装所需插件 +2. 安装所需插件（可选） ```shell -# 安装v4 GenshinUID +# cd进入插件文件夹内 cd plugins +# 安装v4 GenshinUID git clone -b v4 https://ghproxy.com/https://github.com/KimigaiiWuyi/GenshinUID.git --depth=1 --single-branch ``` -2. 安装所需插件 - -```shell -# 安装v4 GenshinUID -cd plugins -git clone -b v4 https://ghproxy.com/https://github.com/KimigaiiWuyi/GenshinUID.git --depth=1 --single-branch -``` - -2. Docker Compose启动 +3. Docker Compose启动 ```shell # 进入项目根目录 diff --git a/requirements.txt b/requirements.txt index 29d8b3b..8b87886 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,12 +6,14 @@ aiosignal==1.3.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0 aiosqlite==0.19.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" anyio==3.7.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" apscheduler==3.10.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" +async-generator==1.10 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" async-timeout==4.0.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" attrs==23.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" backports-zoneinfo==0.2.1 ; python_full_version >= "3.8.1" and python_version < "3.9" bcrypt==4.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" beautifulsoup4==4.12.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" certifi==2023.5.7 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" +cffi==1.15.1 ; os_name == "nt" and implementation_name != "pypy" and python_full_version >= "3.8.1" and python_full_version < "4.0.0" charset-normalizer==3.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" click==8.1.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" colorama==0.4.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and (platform_system == "Windows" or sys_platform == "win32") @@ -34,8 +36,10 @@ lxml==4.9.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" mpmath==1.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" msgspec==0.16.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" multidict==6.0.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" +outcome==1.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" passlib==1.7.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" pillow==9.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" +pycparser==2.21 ; python_full_version >= "3.8.1" and os_name == "nt" and implementation_name != "pypy" and python_full_version < "4.0.0" pydantic==1.10.9 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" pypng==0.20220715.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" python-multipart==0.0.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" @@ -45,6 +49,7 @@ setuptools==67.8.0 ; python_full_version >= "3.8.1" and python_full_version < "4 six==1.16.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" smmap==5.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" sniffio==1.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" +sortedcontainers==2.4.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" soupsieve==2.4.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" sqlalchemy-database==0.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" sqlalchemy2-stubs==0.0.2a34 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" @@ -52,6 +57,7 @@ sqlalchemy==1.4.41 ; python_full_version >= "3.8.1" and python_full_version < "4 sqlmodel==0.0.8 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" sqlmodelx==0.0.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" starlette==0.27.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" +trio==0.22.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" typing-extensions==4.6.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" tzdata==2023.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and platform_system == "Windows" tzlocal==5.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"