From 2133c1d6afee5f5f92d201c41994f950a77b9aed Mon Sep 17 00:00:00 2001 From: lanvent Date: Tue, 9 May 2023 23:08:20 +0800 Subject: [PATCH 1/3] fix(Dockerfile): create /home/noroot directory and change ownership of it --- docker/Dockerfile.debian | 3 ++- docker/Dockerfile.latest | 3 ++- plugins/plugin_manager.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 798642d06..7f6e164bc 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -31,9 +31,10 @@ WORKDIR ${BUILD_PREFIX} ADD ./entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh \ + && mkdir -p /home/noroot \ && groupadd -r noroot \ && useradd -r -g noroot -s /bin/bash -d /home/noroot noroot \ - && chown -R noroot:noroot ${BUILD_PREFIX} + && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX} USER noroot diff --git a/docker/Dockerfile.latest b/docker/Dockerfile.latest index 7f2d6aedc..a9833ed4d 100644 --- a/docker/Dockerfile.latest +++ b/docker/Dockerfile.latest @@ -25,9 +25,10 @@ WORKDIR ${BUILD_PREFIX} ADD docker/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh \ + && mkdir -p /home/noroot \ && groupadd -r noroot \ && useradd -r -g noroot -s /bin/bash -d /home/noroot noroot \ - && chown -R noroot:noroot ${BUILD_PREFIX} + && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX} USER noroot diff --git a/plugins/plugin_manager.py b/plugins/plugin_manager.py index d2ee75e39..d8ad2c3e7 100644 --- a/plugins/plugin_manager.py +++ b/plugins/plugin_manager.py @@ -123,7 +123,7 @@ def activate_plugins(self): # 生成新开启的插件实例 try: instance = plugincls() except Exception as e: - logger.error("Failed to init %s, diabled. %s" % (name, e)) + logger.exception("Failed to init %s, diabled. %s" % (name, e)) self.disable_plugin(name) failed_plugins.append(name) continue From f971505c4a489e97449d98a3896595357dacc301 Mon Sep 17 00:00:00 2001 From: Jianglang Date: Tue, 9 May 2023 23:29:03 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4385a5ed7..851f53680 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,12 @@ > 欢迎接入更多应用，参考 [Terminal代码](https://github.com/zhayujie/chatgpt-on-wechat/blob/master/channel/terminal/terminal_channel.py)实现接收和发送消息逻辑即可接入。 同时欢迎增加新的插件，参考 [插件说明文档](https://github.com/zhayujie/chatgpt-on-wechat/tree/master/plugins)。 **一键部署:** - -[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/qApznZ?referralCode=RC3znh) +- 个人微信 + + [![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/qApznZ?referralCode=RC3znh) +- 企业微信应用号 + + [![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/-FHS--?referralCode=RC3znh) # 演示 From 9d2cb75c84cd08e5b723dd414919ac38c1a7b417 Mon Sep 17 00:00:00 2001 From: lanvent Date: Wed, 10 May 2023 23:11:18 +0800 Subject: [PATCH 3/3] fix(docker): chown /usr/local/lib in debian dockerfile --- docker/Dockerfile.debian | 2 +- docker/Dockerfile.latest | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 7f6e164bc..302fc4fae 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -34,7 +34,7 @@ RUN chmod +x /entrypoint.sh \ && mkdir -p /home/noroot \ && groupadd -r noroot \ && useradd -r -g noroot -s /bin/bash -d /home/noroot noroot \ - && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX} + && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX} /usr/local/lib USER noroot diff --git a/docker/Dockerfile.latest b/docker/Dockerfile.latest index a9833ed4d..d0a2475ba 100644 --- a/docker/Dockerfile.latest +++ b/docker/Dockerfile.latest @@ -28,8 +28,8 @@ RUN chmod +x /entrypoint.sh \ && mkdir -p /home/noroot \ && groupadd -r noroot \ && useradd -r -g noroot -s /bin/bash -d /home/noroot noroot \ - && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX} + && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX} /usr/local/lib USER noroot -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file