Update BuildLauncher.yml

.github/workflows/BuildLauncher.yml

@@ -2,6 +2,16 @@ name: 构建启动器
 on:
   workflow_dispatch:
     inputs:
+      runner_os:
+        description: 选择运行器系统
+        type: choice
+        required: true
+        default: 'ubuntu-latest'
+        options:
+          - ubuntu-latest
+          - ubuntu-24.04
+          - ubuntu-22.04
+          - ubuntu-host
       build_modules:
         description: '构建 Modules'
         required: true
@@ -28,9 +38,9 @@ env:
   MANAGED_ZIP_FILE: Managed.zip
 
 jobs:
-  build-spt:
+  build-launcher:
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner_os }}
-    container: refringe/spt-build-dotnet:2.1.0
+    container: mcr.microsoft.com/dotnet/sdk:10.0
     defaults:
       run:
         shell: bash

.github/workflows/BuildServer.yml

@@ -11,6 +11,7 @@ on:
         options:
           - ubuntu-latest
           - ubuntu-24.04
+          - ubuntu-22.04
           - ubuntu-host
       push_to_docker:
         description: 推送到 Docker Hub

Dockerfile

@@ -2,7 +2,8 @@
 # BUILD STAGE
 # ================================
 #FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
-FROM mcr.azure.cn/dotnet/sdk:9.0-alpine AS build
+#FROM mcr.azure.cn/dotnet/sdk:9.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 
 ARG SPT_VERSION
 ARG SPT_BUILD_TYPE
@@ -32,7 +33,8 @@ RUN dotnet publish ./SPTarkov.Server/SPTarkov.Server.csproj \
 # RUNTIME STAGE
 # ================================
 #FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final
-FROM mcr.azure.cn/dotnet/aspnet:9.0-alpine AS final
+#FROM mcr.azure.cn/dotnet/aspnet:9.0-alpine AS final
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS final
 
 ARG SPT_BUILD_CONFIG
 

build-launcher.sh

@@ -170,7 +170,7 @@ fi
 chmod a+x bin/*
 
 # 添加容器镜像和构建脚本
-DOCKER_CMD="$DOCKER_CMD refringe/spt-build-dotnet:2.1.0"
+DOCKER_CMD="$DOCKER_CMD mcr.microsoft.com/dotnet/sdk:9.0"
 DOCKER_CMD="$DOCKER_CMD /build.sh"
 DOCKER_CMD="$DOCKER_CMD \"$DATE_TIME\""
 DOCKER_CMD="$DOCKER_CMD \"$SPT_VERSION\""
@@ -197,7 +197,7 @@ eval $DOCKER_CMD
 #  -v "./build.sh:/build.sh:ro" \
 #  -v "./bin/zip:/usr/bin/zip:ro" \
 #  -v "./bin/unzip:/usr/bin/unzip:ro" \
-#  refringe/spt-build-dotnet:2.1.0 \
+#  mcr.microsoft.com/dotnet/sdk:9.0 \
 #  /build.sh \
 #  "$DATE_TIME" \
 #  "$SPT_VERSION" \

build-server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-SPT_SERVER_REPOSITORY=sp-tarkov/server-csharp
+SPT_SERVER_REPOSITORY="sp-tarkov/server-csharp"
-SPT_SERVER_BRANCH=develop
+SPT_SERVER_BRANCH="develop"
 
 # 设置默认用户名，支持从参数传入
 DOCKER_USERNAME="yhl452493373"