From 9e76c29231ee2847de5ee8b5cf00191b1aa246d8 Mon Sep 17 00:00:00 2001 From: yhl452493373 Date: Fri, 21 Nov 2025 23:46:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8buildx=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/BuildServer.yml | 7 +++++-- build-server.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/BuildServer.yml b/.github/workflows/BuildServer.yml index 69da3e2..2404466 100644 --- a/.github/workflows/BuildServer.yml +++ b/.github/workflows/BuildServer.yml @@ -34,6 +34,9 @@ jobs: - name: 检出代码 uses: actions/checkout@v4 + - name: 设置 Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: 检查 Docker Hub 配置 id: docker-config run: | @@ -116,13 +119,13 @@ jobs: echo "运行器操作系统: ${{ inputs.runner_os }}" echo "镜像标签: ${{ steps.exist-tag.outputs.tag }}" echo "用户选择推送到 Docker Hub: ${{ inputs.push_to_docker }}" - echo "实际是否推送到 Docker Hub: ${{ steps.check-docker-config.outputs.push_available }}" + echo "实际是否推送到 Docker Hub: ${{ steps.docker-config.outputs.push_available }}" if [ "${{ inputs.output_path }}" != "" ]; then echo "镜像文件保存到: ${{ inputs.output_path }}/${{ env.IMAGE_FILE }}" else echo "未提供输出路径,镜像文件未保存" fi - if [ "${{ steps.check-docker-config.outputs.push_available }}" = "true" ]; then + if [ "${{ steps.docker-config.outputs.push_available }}" = "true" ]; then echo "已推送到 Docker Hub" echo "推送的标签: ${{ steps.exist-tag.outputs.tag }}" else diff --git a/build-server.sh b/build-server.sh index ca9d5ad..be58e1e 100644 --- a/build-server.sh +++ b/build-server.sh @@ -23,7 +23,7 @@ echo "开始构建镜像" # 先删除可能存在的旧标签文件 rm -rf image_tag.txt -docker build \ +docker buildx build \ -t $IMAGE_TAG \ --build-arg SPT_VERSION=$SPT_VERSION \ --build-arg SPT_BUILD_TYPE=$SPT_BUILD_TYPE \