From 9502bd3ddc85dcbbea5df04433b26634accfbf4e Mon Sep 17 00:00:00 2001 From: Sirly <45280500+SirlyDreamer@users.noreply.github.com> Date: Mon, 6 Mar 2023 11:38:52 +0800 Subject: [PATCH] =?UTF-8?q?Docker=E5=88=9D=E6=AD=A5=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=96=B5=E5=96=B5=E7=89=88=E4=BA=91=E5=B4=BD=20(#4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 36 ++++++++++++++---------------------- docker/Dockerfile | 10 +++++----- docker/docker-entrypoint.sh | 22 ++++++++++++++-------- docker/qq.yaml | 6 ------ 4 files changed, 33 insertions(+), 41 deletions(-) delete mode 100644 docker/qq.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml index caea566..1fb107b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,32 +1,24 @@ version: "3" services: - yunzai-bot: - container_name: yunzai-bot - # build: ./docker # 使用 Dockerfile 本地构建 - image: swr.cn-south-1.myhuaweicloud.com/sirly/yunzai-bot:v3 # 使用云端精简镜像 - # image: swr.cn-south-1.myhuaweicloud.com/sirly/yunzai-bot:v3plus # 使用扩展镜像，包含ffmpeg和python - # image: sirly/yunzai-bot:v3 # Docker Hub源 - # image: sirly/yunzai-bot:v3plus - # user: "1000:1000" # 指定容器内用户,格式"UID:GID"（请先修改文件夹权限） + miao-yunzai: + container_name: miao-yunzai + build: ./docker # 使用 Dockerfile 本地构建 restart: always # ports: # - "50831:50831" # 映射锅巴插件端口，格式"主机端口:容器内部端口" volumes: - - ./yunzai/config/:/app/Yunzai-Bot/config/config/ # Bot基础配置文件 - - ./yunzai/genshin_config:/app/Yunzai-Bot/plugins/genshin/config # 公共Cookie，云崽功能配置文件 - - ./yunzai/logs:/app/Yunzai-Bot/logs # 日志文件 - - ./yunzai/data:/app/Yunzai-Bot/data # 数据文件 + - ./yunzai/config/:/app/Miao-Yunzai/config/config/ # Bot基础配置文件 + - ./yunzai/genshin_config:/app/Miao-Yunzai/plugins/genshin/config # 公共Cookie，云崽功能配置文件 + - ./yunzai/logs:/app/Miao-Yunzai/logs # 日志文件 + - ./yunzai/data:/app/Miao-Yunzai/data # 数据文件 # 以下目录是插件目录，安装完插件后需要手动添加映射（如有其他插件请自行添加） - # 映射格式：./yunzai/plugins/<插件目录名>:/app/Yunzai-Bot/plugins/<插件目录名> - # - ./yunzai/plugins/example:/app/Yunzai-Bot/plugins/example # 单js插件目录 - # - ./yunzai/plugins/miao-plugin:/app/Yunzai-Bot/plugins/miao-plugin # 喵喵插件 - # - ./yunzai/plugins/py-plugin:/app/Yunzai-Bot/plugins/py-plugin # 新py插件 - # - ./yunzai/plugins/xiaoyao-cvs-plugin:/app/Yunzai-Bot/plugins/xiaoyao-cvs-plugin # 图鉴插件 + # 映射格式：./yunzai/plugins/<插件目录名>:/app/Miao-Yunzai/plugins/<插件目录名> + # - ./yunzai/plugins/example:/app/Miao-Yunzai/plugins/example # 单js插件目录 + - ./yunzai/plugins/miao-plugin:/app/Miao-Yunzai/plugins/miao-plugin # 默认映射喵喵插件 + # - ./yunzai/plugins/py-plugin:/app/Miao-Yunzai/plugins/py-plugin # 新py插件 + # - ./yunzai/plugins/xiaoyao-cvs-plugin:/app/Miao-Yunzai/plugins/xiaoyao-cvs-plugin # 图鉴插件 #### [警告] 受云崽架构和docker特性限制，使用锅巴插件安装的插件无法持久化，销毁容器后新安装的插件会消失，请谨慎使用 #### - # - ./yunzai/plugins/Guoba-Plugin:/app/Yunzai-Bot/plugins/Guoba-Plugin # 锅巴插件 - environment: - - CUID=1000 # 宿主机运行 id -u 获取 - - CGID=1000 # 宿主机运行 id -g 获取 + # - ./yunzai/plugins/Guoba-Plugin:/app/Miao-Yunzai/plugins/Guoba-Plugin # 锅巴插件 depends_on: redis: { condition: service_healthy } deploy: @@ -35,7 +27,7 @@ services: memory: 2G redis: - container_name: yunzai-redis + container_name: miao-redis image: redis:alpine restart: always volumes: diff --git a/docker/Dockerfile b/docker/Dockerfile index 78f1256..77fa3ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -48,13 +48,13 @@ FROM runtime AS prod ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \ PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium -RUN git clone --depth=1 --branch master https://github.com/yoimiya-kokomi/Miao-Yunzai.git /app/Yunzai-Bot\ - && cd /app/Yunzai-Bot \ +RUN git clone --depth=1 --branch master https://github.com/yoimiya-kokomi/Miao-Yunzai.git /app/Miao-Yunzai\ + && cd /app/Miao-Yunzai \ && sed -i 's/127.0.0.1/redis/g' ./config/default_config/redis.yaml \ && pnpm install -P -COPY --from=resource /res/entrypoint.sh /app/Yunzai-Bot/entrypoint.sh +COPY --from=resource /res/entrypoint.sh /app/Miao-Yunzai/entrypoint.sh -WORKDIR /app/Yunzai-Bot +WORKDIR /app/Miao-Yunzai -ENTRYPOINT ["/app/Yunzai-Bot/entrypoint.sh"] +ENTRYPOINT ["/app/Miao-Yunzai/entrypoint.sh"] diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 3675ce1..7b05fa5 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -11,16 +11,16 @@ Version="${BlueBG}[版本]${Font}" Info="${GreenBG}[信息]${Font}" Warn="${YellowBG}[提示]${Font}" -WORK_DIR="/app/Yunzai-Bot" -MIAO_PLUGIN_PATH="/app/Yunzai-Bot/plugins/miao-plugin" -XIAOYAO_CVS_PATH="/app/Yunzai-Bot/plugins/xiaoyao-cvs-plugin" -PY_PLUGIN_PATH="/app/Yunzai-Bot/plugins/py-plugin" +WORK_DIR="/app/Miao-Yunzai" +MIAO_PLUGIN_PATH="/app/Miao-Yunzai/plugins/miao-plugin" +XIAOYAO_CVS_PATH="/app/Miao-Yunzai/plugins/xiaoyao-cvs-plugin" +PY_PLUGIN_PATH="/app/Miao-Yunzai/plugins/py-plugin" if [[ ! -d "$HOME/.ovo" ]]; then mkdir ~/.ovo fi -echo -e "\n ================ \n ${Info} ${GreenBG} 拉取 Yunzai-Bot 更新 ${Font} \n ================ \n" +echo -e "\n ================ \n ${Info} ${GreenBG} 拉取 Miao-Yunzai 更新 ${Font} \n ================ \n" cd $WORK_DIR @@ -36,16 +36,22 @@ fi if [[ ! -f "$HOME/.ovo/yunzai.ok" ]]; then set -e - echo -e "\n ================ \n ${Info} ${GreenBG} 更新 Yunzai-Bot 运行依赖 ${Font} \n ================ \n" + echo -e "\n ================ \n ${Info} ${GreenBG} 更新 Miao-Yunzai 运行依赖 ${Font} \n ================ \n" pnpm install -P touch ~/.ovo/yunzai.ok set +e fi -echo -e "\n ================ \n ${Version} ${BlueBG} Yunzai-Bot 版本信息 ${Font} \n ================ \n" +echo -e "\n ================ \n ${Version} ${BlueBG} Miao-Yunzai 版本信息 ${Font} \n ================ \n" git log -1 --pretty=format:"%h - %an, %ar (%cd) : %s" +if [ ! -d $MIAO_PLUGIN_PATH"/.git" ]; then + echo -e "\n ${Warn} ${YellowBG} 由于喵版云崽依赖miao-plugin，检测到目前没有安装，开始自动下载 ${Font} \n" + git clone --depth=1 https://gitee.com/yoimiya-kokomi/miao-plugin.git ./plugins/miao-plugin/ +fi + + if [ -d $MIAO_PLUGIN_PATH"/.git" ]; then echo -e "\n ================ \n ${Info} ${GreenBG} 拉取 喵喵插件 更新 ${Font} \n ================ \n" @@ -176,6 +182,6 @@ if [ -f "./config/config/redis.yaml" ]; then echo -e "\n 修改Redis地址完成~ \n" fi -echo -e "\n ================ \n ${Info} ${GreenBG} 启动 Yunzai-Bot ${Font} \n ================ \n" +echo -e "\n ================ \n ${Info} ${GreenBG} 启动 Miao-Yunzai ${Font} \n ================ \n" node app diff --git a/docker/qq.yaml b/docker/qq.yaml deleted file mode 100644 index 388b6f6..0000000 --- a/docker/qq.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# qq账号 -qq: 123456 -# 密码，为空则用扫码登录,扫码登录现在仅能在同一ip下进行 -pwd: -# 1:安卓手机、 2:aPad 、 3:安卓手表、 4:MacOS 、 5:iPad -platform: 5 \ No newline at end of file