diff --git a/deploy/buildkitd.toml b/deploy/buildkitd.toml new file mode 100644 index 00000000..fbf98a02 --- /dev/null +++ b/deploy/buildkitd.toml @@ -0,0 +1,2 @@ +[registry."docker.io"] + mirrors = ["m.daocloud.io/docker.io"] diff --git a/scripts/deploy-from-workstation.ps1 b/scripts/deploy-from-workstation.ps1 index 08bdde6b..11b37a4e 100644 --- a/scripts/deploy-from-workstation.ps1 +++ b/scripts/deploy-from-workstation.ps1 @@ -10,6 +10,7 @@ param( [string]$RemotePath = '/opt/caiwuxitong', [string]$AppUrl, [string]$BuilderName = 'caiwu-builder', + [string]$BuildkitImage = 'm.daocloud.io/docker.io/moby/buildkit:buildx-stable-1', [int]$KeepImages = 2, [switch]$BootstrapServer, [switch]$AllowNonMain, @@ -25,6 +26,7 @@ $tempRoot = Join-Path ([IO.Path]::GetTempPath()) ("caiwu-deploy-" + [Guid]::NewG $localArchive = Join-Path $tempRoot 'image.tar' $remoteArchive = $null $bootstrapRemote = $null +$buildkitConfig = Join-Path $repoRoot 'deploy/buildkitd.toml' function Invoke-Native { param( @@ -89,7 +91,12 @@ try { docker buildx inspect $BuilderName 2>$null | Out-Null if ($LASTEXITCODE -ne 0) { Invoke-Native { - docker buildx create --name $BuilderName --driver docker-container --use | Out-Null + docker buildx create ` + --name $BuilderName ` + --driver docker-container ` + --driver-opt "image=$BuildkitImage" ` + --buildkitd-config $buildkitConfig ` + --use | Out-Null } '创建项目专属 BuildKit 构建器失败。' }