@@ -32,15 +32,15 @@ jobs:
32
32
restore-keys : |
33
33
buildkit-${{ runner.os }}-
34
34
35
- - name : Restore BuildKit daemon Cache
35
+ - name : Restore Daemon Cache
36
36
uses : actions/cache/restore@v4
37
- id : restore-buildkitd -cache
37
+ id : restore-droot -cache
38
38
with :
39
39
path : |
40
- buildkitd
41
- key : buildkitd -${{ runner.os }}-
40
+ droot
41
+ key : droot -${{ runner.os }}-
42
42
restore-keys : |
43
- buildkitd -${{ runner.os }}-
43
+ droot -${{ runner.os }}-
44
44
45
45
- name : Log in to Container Registry
46
46
uses : docker/login-action@v3
@@ -98,15 +98,16 @@ jobs:
98
98
99
99
$logs = "buildkit/logs"
100
100
$cni = "${{ github.workspace }}\buildkit\cni"
101
- $droot = "${{ github.workspace }}\buildkitd\root "
101
+ $droot = "${{ github.workspace }}\droot "
102
102
103
103
Start-Job -ScriptBlock {
104
- param($logs)
104
+ param($logs, $droot )
105
105
Start-Process containerd.exe `
106
+ -ArgumentList @("--root=$droot\containerd") `
106
107
-RedirectStandardOutput "$logs/containerd.log" `
107
108
-RedirectStandardError "$logs/containerd_error.log" `
108
109
-NoNewWindow -PassThru
109
- } -ArgumentList $logs
110
+ } -ArgumentList $logs, $droot
110
111
111
112
Wait-For "ctr --namespace buildkit image ls"
112
113
@@ -115,7 +116,7 @@ jobs:
115
116
Start-Process buildkitd.exe `
116
117
-ArgumentList @("--containerd-cni-config-path=$cni\0-containerd-nat.conf",
117
118
"--containerd-cni-binary-dir=$cni", `
118
- "--root=$droot") `
119
+ "--root=$droot\buildkitd ") `
119
120
-RedirectStandardOutput "$logs/buildkitd.log" `
120
121
-RedirectStandardError "$logs/buildkitd_error.log" `
121
122
-NoNewWindow -PassThru
@@ -181,10 +182,10 @@ jobs:
181
182
buildkit
182
183
key : buildkit-${{ runner.os }}-
183
184
184
- - name : Save BuildKit daemon Cache
185
- id : save-buildkitd -cache
185
+ - name : Save Daemon Cache
186
+ id : save-droot -cache
186
187
uses : actions/cache/save@v4
187
188
with :
188
189
path : |
189
- buildkitd
190
- key : buildkitd -${{ runner.os }}-
190
+ droot
191
+ key : droot -${{ runner.os }}-
0 commit comments