From 7b759cd51c6dd3ecffd0cbf412ab77e4021ed05e Mon Sep 17 00:00:00 2001 From: hg-hg <46097315+hg-hg@users.noreply.github.com> Date: Sat, 6 Feb 2021 20:33:49 +0800 Subject: [PATCH 1/3] fix docker-build-bot.sh, update README.md --- README.md | 4 ++-- scripts/docker-image/docker-build-bot.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8ae3c87..a34bb6e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ A qq-bot named 二狗, 基于 mirai / mirai-http / Garia. ## 运行方法 -build bot 所需 docker 镜像: `cd script/docker-image; sh docker-build.sh` +build bot 所需 docker 镜像: `cd script/docker-image; sh docker-build-bot.sh` 运行 bot 容器并启动 bot: `sh scripts/docker-start-bot.sh` @@ -62,4 +62,4 @@ build bot 所需 docker 镜像: `cd script/docker-image; sh docker-build.sh` A Chinese Font derived from SetoFont / Naikai Font / cjkFonts-AllSeto. -一款衍生于濑户字体 / 内海字体 / cjkFonts 全濑体的中文字体。[github repo](https://github.com/lxgw/kose-font) \ No newline at end of file +一款衍生于濑户字体 / 内海字体 / cjkFonts 全濑体的中文字体。[github repo](https://github.com/lxgw/kose-font) diff --git a/scripts/docker-image/docker-build-bot.sh b/scripts/docker-image/docker-build-bot.sh index 1e84591..a14b99c 100644 --- a/scripts/docker-image/docker-build-bot.sh +++ b/scripts/docker-image/docker-build-bot.sh @@ -1 +1,5 @@ +#!/bin/sh +if [ ! -f "mongodb-linux-x86_64-ubuntu1804-4.4.2.tgz" ]; then + wget http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.4.2.tgz +fi sudo docker build -t ergo-bot -f Dockerfile.bot . From d9189127fa8b7747141202dd4df2fd3881177ef6 Mon Sep 17 00:00:00 2001 From: hg-hg <46097315+hg-hg@users.noreply.github.com> Date: Sat, 6 Feb 2021 20:42:28 +0800 Subject: [PATCH 2/3] fix dir var in docker-start-bot.sh --- scripts/docker-start-bot.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/docker-start-bot.sh b/scripts/docker-start-bot.sh index 37c9354..7f5da37 100644 --- a/scripts/docker-start-bot.sh +++ b/scripts/docker-start-bot.sh @@ -1,5 +1,8 @@ +#!/bin/bash + # 推理API默认已经启动 -ERGO_PROJECT_DIR=$1 +ERGO_PROJECT_DIR=$( dirname "$(readlink -f -- "$0")" ) +ERGO_PROJECT_DIR="${ERGO_PROJECT_DIR}/.." echo "Using Project Dir: "$ERGO_PROJECT_DIR # 启动docker容器并启动bot docker container stop ergo-bot-container From 46d4e07fa5160c5bf831244263aeb11d8c9da400 Mon Sep 17 00:00:00 2001 From: hg-hg <46097315+hg-hg@users.noreply.github.com> Date: Sat, 6 Feb 2021 20:54:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96docker-start-bot.sh?= =?UTF-8?q?=E4=BB=A5=E5=8F=8Astart-bot.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/docker-start-bot.sh | 2 +- scripts/start-bot.sh | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/docker-start-bot.sh b/scripts/docker-start-bot.sh index 7f5da37..974c2bc 100644 --- a/scripts/docker-start-bot.sh +++ b/scripts/docker-start-bot.sh @@ -14,4 +14,4 @@ docker run \ #-v /mnt/1/Projects/gif-reply/data/processed/dataset/gifs:/gifs \ # 启动mongo db docker exec ergo-bot-container sh -c "screen -S mongodb -md mongod --dbpath /mongo --logpath /ErGo/logs/mongod.log --fork" -docker exec ergo-bot-container sh -c "sh /ErGo/scripts/start-bot.sh" +docker exec ergo-bot-container sh -c "sh ${ERGO_PROJECT_DIR}/scripts/start-bot.sh" diff --git a/scripts/start-bot.sh b/scripts/start-bot.sh index 49d2452..8f1adfb 100644 --- a/scripts/start-bot.sh +++ b/scripts/start-bot.sh @@ -1,10 +1,20 @@ +#!/bin/bash + +ERGO_PROJECT_DIR=$( dirname "$(readlink -f -- "$0")" ) +ERGO_PROJECT_DIR="${ERGO_PROJECT_DIR}/.." # 此脚本应在docker容器内运行 -cd /ErGo -mkdir logs +cd $ERGO_PROJECT_DIR +if [ ! -d "${ERGO_PROJECT_DIR}/logs" ]; then + mkdir logs +fi # 启动miral +if [ ! -d "${ERGO_PROJECT_DIR}/mirai" ]; then + mkdir ${ERGO_PROJECT_DIR}/mirai + #TODO: 添加miraiOK_linux-amd64下载指令,或取消.gitignore中mirai文件夹以及其中不涉及个人隐藏信息的文件,GitHub上原MiraiOK仓库提供的下载地址均已失效 +fi cd mirai screen -md -S miraiOK ./miraiOK_linux-amd64 -cd /ErGo +cd $ERGO_PROJECT_DIR sleep 3 # 启动bot screen -md -S bot bash -c 'python3 main.py 2>&1 | tee logs/bot.log'