diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 2b9570d..bfcb350 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -50,7 +50,7 @@ jobs: - name: Get artifacts run: | - bash get_artifacts.sh ${{ secrets.GITHUB_TOKEN }} + bash get_artifacts.sh ${{ secrets.ARTIFACTS_TOKEN }} ls -lh - name: Build and push by digest diff --git a/Dockerfile b/Dockerfile index 73c2902..c92cccd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM initialencounter/napcat:base +FROM mlikiowa/napcat-docker:base COPY NapCat.linux.zip /tmp/NapCat.linux.zip COPY config.txt entrypoint.sh /root/ # 安装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 && \ + 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 && \ diff --git a/get_artifacts.sh b/get_artifacts.sh index f748cd6..3c02c7b 100644 --- a/get_artifacts.sh +++ b/get_artifacts.sh @@ -4,7 +4,7 @@ repository="NapNeko/NapCat.Build" run_id="8662095740" arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/x64/) -artifact_name="NapCat.linux.{$arch}" +artifact_name="NapCat.linux.$arch" token="$1" # 设置输出目录