diff --git a/Dockerfile b/Dockerfile index ec0de4b..5018f58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,26 @@ FROM mlikiowa/napcat-docker:base -COPY NapCat.linux.zip /tmp/NapCat.linux.zip -COPY config.txt entrypoint.sh /root/ +WORKDIR /usr/src/app + +COPY NapCat.linux.zip NapCat.linux.zip +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 && \ - ls -lh /root && \ - dpkg -i --force-depends /root/linuxqq.deb && rm /root/linuxqq.deb && \ + dpkg -i --force-depends /root/linuxqq.deb && rm /root/linuxqq.deb - # 安装 napcat - unzip /tmp/NapCat.linux.zip -d /root/ && \ - mv /root/NapCat.linux.$(arch | sed s/aarch64/arm64/ | sed s/x86_64/x64/)/* /root/ && \ - rm /tmp/NapCat.linux.zip && \ - ln -s /usr/bin/ffmpeg /root/ffmpeg && \ +# 安装 napcat +RUN unzip NapCat.linux.zip && \ + rm NapCat.linux.zip && \ + chmod +x napcat.sh && \ + chmod +x entrypoint.sh - chmod +x /root/napcat.sh && \ - chmod +x /root/entrypoint.sh && \ - - echo "[supervisord]" > /etc/supervisord.conf && \ +# 配置 supervisord +RUN echo "[supervisord]" > /etc/supervisord.conf && \ echo "nodaemon=true" >> /etc/supervisord.conf && \ echo "[program:napcat]" >> /etc/supervisord.conf && \ echo "command=COMMAND" >> /etc/supervisord.conf -WORKDIR "/root" - -ENTRYPOINT ["/root/entrypoint.sh"] +ENTRYPOINT ["sh", "entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh index ed8b31b..58460e6 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,11 +1,11 @@ #!/bin/bash -sed -i "s|COMMAND|bash /root/napcat.sh -q $ACCOUNT|" /etc/supervisord.conf +sed -i "s|COMMAND|bash napcat.sh -q $ACCOUNT|" /etc/supervisord.conf -CONFIG_PATH=/root/config/onebot11_$ACCOUNT.json +CONFIG_PATH=config/onebot11_$ACCOUNT.json # 容器首次启动时执行 if [ ! -f "$CONFIG_PATH" ]; then - cp -f /root/config.txt $CONFIG_PATH + cp -f config.txt $CONFIG_PATH if [ "$HTTP_PORT" ]; then @@ -93,5 +93,6 @@ if [ ! -f "$CONFIG_PATH" ]; then fi fi -bash /root/napcat.sh -q $ACCOUNT & +export FFMPEG_PATH=/usr/bin/ffmpeg +bash napcat.sh -q $ACCOUNT & exec supervisord