Commit 95f2978
committed
Merge upstream/main to sync with kernel/kernel-images
Resolved conflicts keeping both Reclaim-specific features and upstream improvements:
- config.go: Kept TEE configuration (TEEKUrl, TEETUrl, AttestorUrl)
- openapi.yaml: Kept /reclaim/prove endpoint and ReclaimProve* schemas
- go.mod: Kept all Reclaim TEE dependencies and updated to latest versions
- log.ts: Kept OpenTelemetry logging wrapper around base loggers
- proxy.go: Adopted upstream's improved CDP reconnection logic with dialUpstreamWithRetry
- Dockerfiles: Hybrid approach - auto-detect ChromeDriver version with override option
Key upstream improvements integrated:
- CDP proxy reconnection on Chromium restart (kernel#189, kernel#191)
- Improved fonts support (kernel#165)
- Better error handling in devtools proxy
- Updated dependency versions
All conflicts resolved, go.sum regenerated, oapi.go regenerated.6 files changed
Lines changed: 897 additions & 26 deletions
File tree
- images
- chromium-headful
- chromium-headless/image
- server
- e2e
- lib/devtoolsproxy
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
204 | 204 | | |
205 | 205 | | |
206 | 206 | | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
207 | 216 | | |
| 217 | + | |
208 | 218 | | |
209 | 219 | | |
| 220 | + | |
210 | 221 | | |
211 | | - | |
212 | | - | |
213 | | - | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
214 | 243 | | |
215 | 244 | | |
216 | 245 | | |
| |||
262 | 291 | | |
263 | 292 | | |
264 | 293 | | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
265 | 297 | | |
266 | | - | |
267 | | - | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
268 | 302 | | |
269 | 303 | | |
270 | 304 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
157 | 157 | | |
158 | 158 | | |
159 | 159 | | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
160 | 163 | | |
161 | | - | |
162 | | - | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
163 | 168 | | |
164 | 169 | | |
165 | 170 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
0 commit comments