From 86976aa01fe338e48bd98d8eb828af9e4005c66f Mon Sep 17 00:00:00 2001 From: xtaodada Date: Wed, 1 Feb 2023 12:20:58 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20hotfix:=20sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.gen.yml | 11 ++++++----- pagermaid/utils.py | 1 - utils/docker-config.sh | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker-compose.gen.yml b/docker-compose.gen.yml index d7a448d..7655931 100644 --- a/docker-compose.gen.yml +++ b/docker-compose.gen.yml @@ -5,11 +5,12 @@ services: restart: always container_name: pagermaid hostname: pagermaid - #ports: # 是否开启网页控制面板 - #- "3333:3333" +# ports: # 是否开启网页控制面板 +# - "3333:3333" volumes: - ./:/pagermaid/workdir environment: - - RUN_AS_ROOT=true # 是否以root权限运行pagermaid，true为是，false为否 - - PUID=917 # 当 RUN_AS_ROOT=false时才生效，即以普通用户权限运行pagermaid，可以修改为你定义用户的UID - - PGID=917 # 当 RUN_AS_ROOT=false时才生效，即以普通用户权限运行pagermaid，可以修改为你定义用户的GID +# - WEB_ENABLE=true +# - WEB_SECRET_KEY=控制台密码 + - WEB_HOST=0.0.0.0 +# - WEB_PORT=3333 diff --git a/pagermaid/utils.py b/pagermaid/utils.py index af590b3..d9d545c 100644 --- a/pagermaid/utils.py +++ b/pagermaid/utils.py @@ -77,7 +77,6 @@ async def execute(command, pass_error=True): """ Executes command and returns output, with the option of enabling stderr. """ executor = await create_subprocess_shell( command, - loop=bot.loop, stdout=PIPE, stderr=PIPE, stdin=PIPE diff --git a/utils/docker-config.sh b/utils/docker-config.sh index 83dc864..6dd9788 100644 --- a/utils/docker-config.sh +++ b/utils/docker-config.sh @@ -13,6 +13,7 @@ configure () { echo "生成配置文件中 . . ." cp config.gen.yml $config_file + sed -i "s/127.0.0.1/0.0.0.0/" $config_file printf "请输入应用程序 api_id（不懂请直接回车）：" read -r api_id <&1 sed -i "s/ID_HERE/$api_id/" $config_file