diff --git a/Dockerfile b/Dockerfile index 5018f58..4a214ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,13 @@ COPY config.txt entrypoint.sh ./ # 安装Linux QQ RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ - curl -o /root/linuxqq.deb https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240410_${arch}_01.deb && \ - dpkg -i --force-depends /root/linuxqq.deb && rm /root/linuxqq.deb + curl -o linuxqq.deb https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240410_${arch}_01.deb && \ + dpkg -i --force-depends linuxqq.deb && rm linuxqq.deb # 安装 napcat -RUN unzip NapCat.linux.zip && \ +RUN unzip NapCat.linux.zip -d napcat && \ rm NapCat.linux.zip && \ - chmod +x napcat.sh && \ + chmod +x napcat/napcat.sh && \ chmod +x entrypoint.sh # 配置 supervisord diff --git a/entrypoint.sh b/entrypoint.sh index 58460e6..b706374 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,8 +1,8 @@ #!/bin/bash -sed -i "s|COMMAND|bash napcat.sh -q $ACCOUNT|" /etc/supervisord.conf +sed -i "s|COMMAND|bash napcat/napcat.sh -q $ACCOUNT|" /etc/supervisord.conf -CONFIG_PATH=config/onebot11_$ACCOUNT.json +CONFIG_PATH=napcat/config/onebot11_$ACCOUNT.json # 容器首次启动时执行 if [ ! -f "$CONFIG_PATH" ]; then cp -f config.txt $CONFIG_PATH @@ -94,5 +94,5 @@ if [ ! -f "$CONFIG_PATH" ]; then fi export FFMPEG_PATH=/usr/bin/ffmpeg -bash napcat.sh -q $ACCOUNT & +bash napcat/napcat.sh -q $ACCOUNT & exec supervisord