diff --git a/docker/build/buildImage.cmd b/docker/build/buildImage.cmd index 2f9d0676a..6a845849c 100644 --- a/docker/build/buildImage.cmd +++ b/docker/build/buildImage.cmd @@ -3,6 +3,6 @@ REM start to build echo Start to build docker image @echo on -docker build --tag zai7lou/bilibili_tool_pro:0.2.2 --tag zai7lou/bilibili_tool_pro:latest ../.. +docker build --tag zai7lou/bilibili_tool_pro:latest ../.. @echo off pause diff --git a/docker/build/buildImage_amd64.cmd b/docker/build/buildImage_amd64.cmd index 7542df871..58255a917 100644 --- a/docker/build/buildImage_amd64.cmd +++ b/docker/build/buildImage_amd64.cmd @@ -5,6 +5,6 @@ REM https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/ REM https://segmentfault.com/a/1190000021166703 echo Start to build docker image with amd64-arch @echo on -docker buildx build --tag zai7lou/bilibili_tool_pro:0.0.5 --output "type=image,push=false" --platform linux/amd64 ../.. +docker buildx build --tag zai7lou/bilibili_tool_pro:latest --output "type=image,push=false" --platform linux/amd64 ../.. @echo off pause diff --git a/podman/build/buildImage.cmd b/podman/build/buildImage.cmd index 087533c3b..6804631c2 100644 --- a/podman/build/buildImage.cmd +++ b/podman/build/buildImage.cmd @@ -3,6 +3,6 @@ REM start to build echo Start to build image @echo on -podman build -t docker.io/zai7lou/bilibili_tool_pro:0.2.2 -t docker.io/zai7lou/bilibili_tool_pro:latest ../.. +podman build -t docker.io/zai7lou/bilibili_tool_pro:latest ../.. @echo off pause diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh index fc4629f1d..946ae5f3c 100644 --- a/qinglong/DefaultTasks/bili_task_base.sh +++ b/qinglong/DefaultTasks/bili_task_base.sh @@ -321,7 +321,7 @@ install_dotnet_by_script() { eval $invocation say "再尝试使用官方脚本安装" - curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --no-cdn --verbose + curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 8.0 --no-cdn --verbose say "添加到PATH" local exportFile="/root/.bashrc" @@ -353,7 +353,7 @@ install_dotnet() { curl -o packages-microsoft-prod.deb https://packages.microsoft.com/config/debian/$VERSION_ID/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb rm packages-microsoft-prod.deb - apt-get update && apt-get install -y dotnet-sdk-6.0 + apt-get update && apt-get install -y dotnet-sdk-8.0 } || { install_dotnet_by_script } @@ -367,7 +367,7 @@ install_dotnet() { apk update fi { - apk add dotnet6-sdk + apk add dotnet8-sdk } || { install_dotnet_by_script } diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh index 84019263e..e6fa17a4f 100644 --- a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh +++ b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh @@ -262,7 +262,7 @@ check_dotnet() { eval $invocation dotnetVersion=$(dotnet --version) - if [[ $dotnetVersion == 6.* ]]; then + if [[ $dotnetVersion == 8.* ]]; then say "已安装dotnet,当前版本:$dotnetVersion" say "which dotnet: $(which dotnet)" return 0 @@ -321,7 +321,7 @@ install_dotnet_by_script() { eval $invocation say "再尝试使用官方脚本安装" - curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --no-cdn --verbose + curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 8.0 --no-cdn --verbose say "添加到PATH" local exportFile="/root/.bashrc" @@ -353,7 +353,7 @@ install_dotnet() { curl -o packages-microsoft-prod.deb https://packages.microsoft.com/config/debian/$VERSION_ID/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb rm packages-microsoft-prod.deb - apt-get update && apt-get install -y dotnet-sdk-6.0 + apt-get update && apt-get install -y dotnet-sdk-8.0 } || { install_dotnet_by_script } @@ -367,7 +367,7 @@ install_dotnet() { apk update fi { - apk add dotnet6-sdk + apk add dotnet8-sdk } || { install_dotnet_by_script }