Skip to content

Comments

Restore separate custom init step parameters (fix regression from #1963)#1974

Merged
lbussell merged 1 commit intodotnet:mainfrom
lbussell:fix-custom-build-init-steps
Feb 20, 2026
Merged

Restore separate custom init step parameters (fix regression from #1963)#1974
lbussell merged 1 commit intodotnet:mainfrom
lbussell:fix-custom-build-init-steps

Conversation

@lbussell
Copy link
Member

@lbussell lbussell commented Feb 20, 2026

Summary

PR #1963 ("Update Image Builder tag reference") inadvertently reverted the fix from #1954 ("Separate custom init steps from job-specific init steps") due to a bad merge. This re-introduced the bug where Windows PR validation fails because Microsoft.DotNet.ImageBuilder.exe is never downloaded.

This is currently breaking the dotnet-docker nightly PR validation pipeline: dotnet/dotnet-docker#7046.

Changes

Restores the separate parameter pattern from #1954:

  • customBuildInitSteps in build-images.yml — injected after init-common
  • customGenerateMatrixInitSteps in generate-matrix.yml — injected after init-common
  • customCopyBaseImagesInitSteps in copy-base-images.yml / copy-base-images-staging.yml — injected after init-common

These steps run after ImageBuilder setup, not through customInitSteps which would bypass it.

Related PRs

PR Repo Description
#1947 docker-tools Original change that introduced the consolidation pattern
#1954 docker-tools Fix that separated custom init steps from job-specific steps
#1963 docker-tools Bad merge that reverted #1954
#7046 dotnet-docker Downstream PR that pulled in the broken docker-tools update

…net#1963)

PR dotnet#1963 inadvertently reverted the fix from dotnet#1954 due to a bad merge,
re-combining customBuildInitSteps, customGenerateMatrixInitSteps, and
customCopyBaseImagesInitSteps into customInitSteps. This caused
init-imagebuilder.yml to skip the default ImageBuilder pull on Windows,
breaking all Windows PR validation builds.

Restores the separate parameter pattern so these steps run after
init-common rather than through customInitSteps which bypasses
ImageBuilder setup.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
lbussell added a commit to dotnet-docker-bot/dotnet-docker that referenced this pull request Feb 20, 2026
Restores separate customBuildInitSteps, customGenerateMatrixInitSteps,
and customCopyBaseImagesInitSteps parameters so they run after
init-common rather than through customInitSteps, which was causing
init-imagebuilder.yml to skip the default ImageBuilder pull on Windows.

Fix: dotnet/docker-tools#1974

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@lbussell lbussell marked this pull request as ready for review February 20, 2026 03:15
@lbussell lbussell requested a review from a team as a code owner February 20, 2026 03:15
@lbussell lbussell enabled auto-merge (squash) February 20, 2026 03:15
@lbussell lbussell merged commit 37f076a into dotnet:main Feb 20, 2026
20 checks passed
@lbussell lbussell deleted the fix-custom-build-init-steps branch February 20, 2026 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants