Skip to content

fix(ci): improve Docker image caching and native build skip optimization#92633

Merged
mmastrac merged 1 commit intocanaryfrom
mmastrac/docker-cache-improvements
Apr 10, 2026
Merged

fix(ci): improve Docker image caching and native build skip optimization#92633
mmastrac merged 1 commit intocanaryfrom
mmastrac/docker-cache-improvements

Conversation

@mmastrac
Copy link
Copy Markdown
Contributor

@mmastrac mmastrac commented Apr 10, 2026

Summary

  • turbo-cache.mjs: Increase stream buffer from 16KB to 16MB (fixes throughput stalls when piping large artifacts). Add transfer stats tracking with 5s stall warning. getToFile() now returns { ok, stats }.
  • docker-image-cache.js: Switch from docker save/load to export/import (drops redundant base image layers). Use zstd --long=27 for better compression. Add 3x retry logic. Add arch-aware cache key to prevent cross-arch cache poisoning. Add download stats logging.
  • native-cache.js: Consume new getToFile() return shape, log download stats.
  • build_and_deploy.yml: Reorder to try native binary cache restore BEFORE Docker image restore. On cache hit, skip the expensive Docker image download entirely.

@nextjs-bot nextjs-bot added the created-by: Turbopack team PRs by the Turbopack team. label Apr 10, 2026
@mmastrac mmastrac marked this pull request as ready for review April 10, 2026 20:52
@mmastrac mmastrac requested a review from bgw April 10, 2026 20:52
Copy link
Copy Markdown
Contributor Author

mmastrac commented Apr 10, 2026

@nextjs-bot
Copy link
Copy Markdown
Collaborator

nextjs-bot commented Apr 10, 2026

Failing test suites

Commit: c22d352 | About building and testing Next.js

pnpm test-dev-turbo test/development/app-dir/instant-navs-devtools/instant-navs-devtools.test.ts (turbopack) (job)

  • instant-nav-panel > should show loading skeleton during SPA navigation after clicking Start (DD)
Expand output

● instant-nav-panel › should show loading skeleton during SPA navigation after clicking Start

expect(received).toBe(expected) // Object.is equality

Expected: true
Received: false

  164 |           '[data-testid="dynamic-skeleton"]'
  165 |         )
> 166 |         expect(skeleton).toBe(true)
      |                          ^
  167 |       },
  168 |       30000,
  169 |       500

  at toBe (development/app-dir/instant-navs-devtools/instant-navs-devtools.test.ts:166:26)
  at retry (lib/next-test-utils.ts:862:14)
  at Object.<anonymous> (development/app-dir/instant-navs-devtools/instant-navs-devtools.test.ts:161:5)

@nextjs-bot
Copy link
Copy Markdown
Collaborator

nextjs-bot commented Apr 10, 2026

Stats from current PR

✅ No significant changes detected

📊 All Metrics
📖 Metrics Glossary

Dev Server Metrics:

  • Listen = TCP port starts accepting connections
  • First Request = HTTP server returns successful response
  • Cold = Fresh build (no cache)
  • Warm = With cached build artifacts

Build Metrics:

  • Fresh = Clean build (no .next directory)
  • Cached = With existing .next directory

Change Thresholds:

  • Time: Changes < 50ms AND < 10%, OR < 2% are insignificant
  • Size: Changes < 1KB AND < 1% are insignificant
  • All other changes are flagged to catch regressions

⚡ Dev Server

Metric Canary PR Change Trend
Cold (Listen) 456ms 456ms ▁▁▁█▁
Cold (Ready in log) 439ms 439ms ▂▂▅▄▁
Cold (First Request) 817ms 816ms ▇████
Warm (Listen) 456ms 456ms ▁██▁▁
Warm (Ready in log) 438ms 439ms ▁▂▅▇▂
Warm (First Request) 336ms 335ms ▂▂▇█▅
📦 Dev Server (Webpack) (Legacy)

📦 Dev Server (Webpack)

Metric Canary PR Change Trend
Cold (Listen) 456ms 455ms ▁▅▁▅▅
Cold (Ready in log) 441ms 440ms ▃█▃██
Cold (First Request) 1.959s 1.953s ▆█▆▇█
Warm (Listen) 456ms 456ms ▁█▅▁▅
Warm (Ready in log) 439ms 440ms ▅█▃██
Warm (First Request) 1.962s 1.975s ██▇██

⚡ Production Builds

Metric Canary PR Change Trend
Fresh Build 3.929s 3.916s ▃▄▆▆▄
Cached Build 3.957s 3.944s ▂▅▃▅▄
📦 Production Builds (Webpack) (Legacy)

📦 Production Builds (Webpack)

Metric Canary PR Change Trend
Fresh Build 14.560s 14.536s ▂█▁▆█
Cached Build 14.708s 14.760s ▃█▁▇█
node_modules Size 492 MB 492 MB ▁▁▁▁▁
📦 Bundle Sizes

Bundle Sizes

⚡ Turbopack

Client

Main Bundles
Canary PR Change
0-xemccipzit0.js gzip 13 kB N/A -
00-sfwc7hh0nr.js gzip 12.9 kB N/A -
07njffbag0w__.js gzip 156 B N/A -
0cz1d0mv5g_q7.js gzip 39.4 kB 39.4 kB
0lnp3l1q03nf6.js gzip 157 B N/A -
0lsxv4bg541pw.js gzip 65.5 kB N/A -
0p33svf597zhz.js gzip 156 B N/A -
0s8zkgq8tbel7.js gzip 70.8 kB N/A -
0vkt_1wbttko4.js gzip 153 B N/A -
13_2qj6sfhcpr.js gzip 8.51 kB N/A -
13q15tdry7-jw.js gzip 9.81 kB N/A -
163s91ld-ejxd.js gzip 154 B N/A -
16jdy7mb2hpzo.js gzip 2.28 kB N/A -
16lhqjoqbznyg.js gzip 220 B 220 B
17c6iioxxyq_7.js gzip 8.51 kB N/A -
1e9hak60wi8_q.js gzip 10.1 kB N/A -
1elt1qium-r2m.css gzip 115 B 115 B
1lti_nqcijcmi.js gzip 225 B N/A -
1lu_zu666m3ae.js gzip 160 B N/A -
1m9l9vnf18-38.js gzip 49 kB N/A -
1rmcmivcklfqn.js gzip 155 B N/A -
1zq04q8id1dsq.js gzip 8.59 kB N/A -
22jf6c01ubp3o.js gzip 159 B N/A -
246le60fytek6.js gzip 1.46 kB N/A -
28nzibfilon22.js gzip 156 B N/A -
2g5l7iy9vkloq.js gzip 152 B N/A -
2ipc3se0d9mja.js gzip 7.61 kB N/A -
2rm1ibbmjhlgi.js gzip 8.57 kB N/A -
2tmy32jxo7uy5.js gzip 154 B N/A -
2uqfz1rd1h-yi.js gzip 166 B N/A -
30z650ayitjz3.js gzip 5.67 kB N/A -
33ur7c3w36-m-.js gzip 8.56 kB N/A -
396buwq-nlhir.js gzip 8.59 kB N/A -
39mk1fjm58e-4.js gzip 8.62 kB N/A -
3cq10epinkxrc.js gzip 450 B N/A -
3wc1tgfurjhi-.js gzip 9.23 kB N/A -
3ze9s70gat6n_.js gzip 8.56 kB N/A -
41obdnb4lqdgs.js gzip 13.3 kB N/A -
44dza2th1-3p_.js gzip 155 B N/A -
454bom347xpxj.js gzip 13.8 kB N/A -
457x5n-k0jr1x.js gzip 10.4 kB N/A -
turbopack-00..5k8f.js gzip 4.17 kB N/A -
turbopack-03..7xjr.js gzip 4.17 kB N/A -
turbopack-14..0w66.js gzip 4.17 kB N/A -
turbopack-1a..1idr.js gzip 4.17 kB N/A -
turbopack-1e..y1sm.js gzip 4.17 kB N/A -
turbopack-1e..jwc3.js gzip 4.17 kB N/A -
turbopack-2_..0v01.js gzip 4.17 kB N/A -
turbopack-29..1ie-.js gzip 4.17 kB N/A -
turbopack-2e..unjt.js gzip 4.16 kB N/A -
turbopack-3g..e631.js gzip 4.17 kB N/A -
turbopack-3h..0jbu.js gzip 4.17 kB N/A -
turbopack-3q..nhhi.js gzip 4.17 kB N/A -
turbopack-41..2kti.js gzip 4.18 kB N/A -
turbopack-42..ltb0.js gzip 4.18 kB N/A -
0_1u_xrpzaeaj.js gzip N/A 8.52 kB -
0-ua_-urjvdtw.js gzip N/A 8.56 kB -
04o0z49-uugql.js gzip N/A 157 B -
05_r_-_rf4w-n.js gzip N/A 7.61 kB -
0eihfygkvyao-.js gzip N/A 1.46 kB -
0g_88ua4o_jp-.js gzip N/A 9.24 kB -
0ua91j3aes80c.js gzip N/A 8.58 kB -
0zwsxw6xkvw9p.js gzip N/A 8.62 kB -
1_fyx0hi94qc-.js gzip N/A 49 kB -
1_n6uuxm5qn11.js gzip N/A 170 B -
10mvvt3xn1_3j.js gzip N/A 8.59 kB -
1a5tis5_e07-2.js gzip N/A 70.8 kB -
1b75ishu64v5s.js gzip N/A 13 kB -
1b83ah3nflxjf.js gzip N/A 8.52 kB -
1fd23spooi5r7.js gzip N/A 225 B -
1gx5035rzzsj3.js gzip N/A 157 B -
1jbicyv-mme-i.js gzip N/A 156 B -
1nw99o32asytf.js gzip N/A 450 B -
1y6qa6xp0i1nz.js gzip N/A 13.3 kB -
1yd8qavjpi2n-.js gzip N/A 65.5 kB -
1zs0a63ov-hco.js gzip N/A 153 B -
2-moqrpvsput7.js gzip N/A 161 B -
26i99-ztb0xke.js gzip N/A 157 B -
2c3zssa2_hfne.js gzip N/A 158 B -
2kxdvc3gr7nt9.js gzip N/A 8.59 kB -
2sgg_sxyixu_p.js gzip N/A 13.8 kB -
2sk4gp5rmalb0.js gzip N/A 10.1 kB -
2u87ln5_zfir_.js gzip N/A 5.67 kB -
32k3-ntl-0f4s.js gzip N/A 163 B -
33602db0fe2xi.js gzip N/A 9.81 kB -
34l-6efot4df9.js gzip N/A 156 B -
3e-_gp4rum99w.js gzip N/A 157 B -
3j3snr-ce7e0q.js gzip N/A 10.4 kB -
3wy2l4mynculd.js gzip N/A 155 B -
3yby446qbgls0.js gzip N/A 8.56 kB -
3yypm2pwzx0mq.js gzip N/A 12.9 kB -
41e88xrrb9-u8.js gzip N/A 158 B -
42lado0_6oegq.js gzip N/A 2.28 kB -
turbopack-07..5x3d.js gzip N/A 4.18 kB -
turbopack-09..xjwl.js gzip N/A 4.16 kB -
turbopack-0i..szdq.js gzip N/A 4.18 kB -
turbopack-0x..wzj5.js gzip N/A 4.18 kB -
turbopack-0x..46wb.js gzip N/A 4.18 kB -
turbopack-1r..b2gv.js gzip N/A 4.18 kB -
turbopack-1s..7844.js gzip N/A 4.18 kB -
turbopack-1v..x7eh.js gzip N/A 4.18 kB -
turbopack-2s..1ss4.js gzip N/A 4.18 kB -
turbopack-2t..ntff.js gzip N/A 4.18 kB -
turbopack-37..gyrj.js gzip N/A 4.19 kB -
turbopack-3k..uuv_.js gzip N/A 4.18 kB -
turbopack-3t..5b--.js gzip N/A 4.18 kB -
turbopack-3w..vc63.js gzip N/A 4.18 kB -
Total 464 kB 465 kB ⚠️ +164 B

Server

Middleware
Canary PR Change
middleware-b..fest.js gzip 715 B 717 B
Total 715 B 717 B ⚠️ +2 B
Build Details
Build Manifests
Canary PR Change
_buildManifest.js gzip 435 B 436 B
Total 435 B 436 B ⚠️ +1 B

📦 Webpack

Client

Main Bundles
Canary PR Change
1011-HASH.js gzip 5.58 kB N/A -
2168.HASH.js gzip 169 B N/A -
2225-HASH.js gzip 4.64 kB N/A -
61a8f394-HASH.js gzip 62.8 kB N/A -
850-HASH.js gzip 60.6 kB N/A -
framework-HASH.js gzip 59.7 kB 59.7 kB
main-app-HASH.js gzip 256 B 252 B 🟢 4 B (-2%)
main-HASH.js gzip 39.3 kB 39.6 kB
webpack-HASH.js gzip 1.68 kB 1.68 kB
36c7d9a6-HASH.js gzip N/A 62.8 kB -
3967-HASH.js gzip N/A 4.63 kB -
5025-HASH.js gzip N/A 5.58 kB -
634-HASH.js gzip N/A 60.9 kB -
7586.HASH.js gzip N/A 170 B -
Total 235 kB 235 kB ⚠️ +603 B
Polyfills
Canary PR Change
polyfills-HASH.js gzip 39.4 kB 39.4 kB
Total 39.4 kB 39.4 kB
Pages
Canary PR Change
_app-HASH.js gzip 194 B 194 B
_error-HASH.js gzip 182 B 181 B
css-HASH.js gzip 334 B 333 B
dynamic-HASH.js gzip 1.8 kB 1.81 kB
edge-ssr-HASH.js gzip 255 B 254 B
head-HASH.js gzip 352 B 352 B
hooks-HASH.js gzip 384 B 384 B
image-HASH.js gzip 580 B 581 B
index-HASH.js gzip 259 B 259 B
link-HASH.js gzip 2.52 kB 2.52 kB
routerDirect..HASH.js gzip 320 B 317 B
script-HASH.js gzip 386 B 386 B
withRouter-HASH.js gzip 315 B 315 B
1afbb74e6ecf..834.css gzip 106 B 106 B
Total 7.98 kB 7.99 kB ⚠️ +4 B

Server

Edge SSR
Canary PR Change
edge-ssr.js gzip 125 kB 126 kB
page.js gzip 272 kB 273 kB
Total 398 kB 399 kB ⚠️ +1.38 kB
Middleware
Canary PR Change
middleware-b..fest.js gzip 614 B 617 B
middleware-r..fest.js gzip 156 B 156 B
middleware.js gzip 44.2 kB 44 kB
edge-runtime..pack.js gzip 842 B 842 B
Total 45.8 kB 45.6 kB ✅ -173 B
Build Details
Build Manifests
Canary PR Change
_buildManifest.js gzip 719 B 718 B
Total 719 B 718 B ✅ -1 B
Build Cache
Canary PR Change
0.pack gzip 4.38 MB 4.38 MB
index.pack gzip 114 kB 112 kB 🟢 2.09 kB (-2%)
index.pack.old gzip 113 kB 116 kB 🔴 +2.79 kB (+2%)
Total 4.61 MB 4.61 MB ✅ -1.09 kB

🔄 Shared (bundler-independent)

Runtimes
Canary PR Change
app-page-exp...dev.js gzip 346 kB 346 kB
app-page-exp..prod.js gzip 191 kB 191 kB
app-page-tur...dev.js gzip 345 kB 345 kB
app-page-tur..prod.js gzip 191 kB 191 kB
app-page-tur...dev.js gzip 342 kB 342 kB
app-page-tur..prod.js gzip 189 kB 189 kB
app-page.run...dev.js gzip 342 kB 342 kB
app-page.run..prod.js gzip 190 kB 190 kB
app-route-ex...dev.js gzip 76.9 kB 76.9 kB
app-route-ex..prod.js gzip 52.5 kB 52.5 kB
app-route-tu...dev.js gzip 77 kB 77 kB
app-route-tu..prod.js gzip 52.5 kB 52.5 kB
app-route-tu...dev.js gzip 76.6 kB 76.6 kB
app-route-tu..prod.js gzip 52.2 kB 52.2 kB
app-route.ru...dev.js gzip 76.5 kB 76.5 kB
app-route.ru..prod.js gzip 52.2 kB 52.2 kB
dist_client_...dev.js gzip 324 B 324 B
dist_client_...dev.js gzip 326 B 326 B
dist_client_...dev.js gzip 318 B 318 B
dist_client_...dev.js gzip 317 B 317 B
pages-api-tu...dev.js gzip 43.9 kB 43.9 kB
pages-api-tu..prod.js gzip 33.5 kB 33.5 kB
pages-api.ru...dev.js gzip 43.8 kB 43.8 kB
pages-api.ru..prod.js gzip 33.4 kB 33.4 kB
pages-turbo....dev.js gzip 53.3 kB 53.3 kB
pages-turbo...prod.js gzip 39.1 kB 39.1 kB
pages.runtim...dev.js gzip 53.2 kB 53.2 kB
pages.runtim..prod.js gzip 39 kB 39 kB
server.runti..prod.js gzip 62.8 kB 62.8 kB
Total 3.06 MB 3.06 MB
📎 Tarball URL
https://vercel-packages.vercel.app/next/commits/c22d352f777682ff31914d9ca142f101c1a9ec91/next

@mmastrac mmastrac force-pushed the mmastrac/docker-cache-improvements branch from 95aa7f1 to 94cdf02 Compare April 10, 2026 21:10
Comment on lines +125 to +127
sh(
`zstd -d -c --long=27 --threads=0 ${zstFile} | docker import ${changeFlags} - ${IMAGE_NAME}`
)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make sense to retry the decompression and import? Is the idea that sometimes the download can be corrupted?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're using http:// here and the files are large enough that I managed to get at least one mangled download. 😢

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HTTP??!?!

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our local build cache doesn't leave the intranet apparently so this is ok but we lose integrity checks.

@mmastrac mmastrac force-pushed the mmastrac/docker-cache-improvements branch from 94cdf02 to f0e53bd Compare April 10, 2026 21:25
- turbo-cache.mjs: Add 16MB highWaterMark (was 16KB default) for stream
  downloads/uploads. Add transfer stats tracking (totalBytes, speed,
  maxStallMs) with 5s stall warning. Add formatStats() helper. Change
  getToFile() to return { ok, stats } instead of boolean.

- docker-image-cache.js: Switch from docker save/load to export/import
  (flat filesystem, no redundant base layers). Use zstd --long=27 for
  better compression of large similar blocks. Add retries (3 attempts).
  Add arch-aware cache key. Remove unused pipeToShell/spawn. Add
  download stats logging.

- native-cache.js: Use new getToFile() return shape, log download stats.

- build_and_deploy.yml: Reorder steps to try native binary cache restore
  BEFORE loading the Docker image. If the binary cache hits, skip the
  expensive Docker image restore entirely.
@mmastrac mmastrac force-pushed the mmastrac/docker-cache-improvements branch from f0e53bd to c22d352 Compare April 10, 2026 21:44
@mmastrac mmastrac enabled auto-merge (squash) April 10, 2026 21:46
@mmastrac mmastrac force-pushed the mmastrac/docker-cache-improvements branch 2 times, most recently from 2ed35d2 to c22d352 Compare April 10, 2026 22:49
@mmastrac mmastrac disabled auto-merge April 10, 2026 23:21
@mmastrac mmastrac enabled auto-merge (squash) April 10, 2026 23:21
@mmastrac mmastrac disabled auto-merge April 10, 2026 23:22
@mmastrac mmastrac merged commit dd2b8fd into canary Apr 10, 2026
513 of 520 checks passed
@mmastrac mmastrac deleted the mmastrac/docker-cache-improvements branch April 10, 2026 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

created-by: Turbopack team PRs by the Turbopack team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants