Pass container image correctly for source-build job in official build #64770
+1
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1ES PT expects an object with the container image, not just the name. Use the same azureLinux30Net10BuildAmd64 container as we do in other jobs since we only build managed code.
github-actions
bot
added
the
area-infrastructure
Contributor
There was a problem hiding this comment.
Pull request overview
This PR corrects the container image specification for the source-build job in official builds to comply with 1ES Pipeline Template requirements. The change updates from a hardcoded container image string to a properly defined container object reference.
Key Changes:
- Changed
containerfrom string literal'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'to variable referenceazureLinux30Net10BuildAmd64
ilonatommy
approved these changes
Dec 15, 2025
Member
Author
|
/backport to release/10.0 |
Member
Author
|
/backport to release/9.0 |
Contributor
|
Started backporting to |
Member
Author
|
/backport to release/8.0 |
Contributor
|
Started backporting to |
Contributor
|
Started backporting to |
Contributor
|
@akoeplinger backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Pass container image correctly for source-build job in official build
Using index info to reconstruct a base tree...
M .azure/pipelines/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .azure/pipelines/ci.yml
CONFLICT (content): Merge conflict in .azure/pipelines/ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Pass container image correctly for source-build job in official build
Error: The process '/usr/bin/git' failed with exit code 128 |
Contributor
|
@akoeplinger backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Pass container image correctly for source-build job in official build
Using index info to reconstruct a base tree...
M .azure/pipelines/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .azure/pipelines/ci.yml
CONFLICT (content): Merge conflict in .azure/pipelines/ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Pass container image correctly for source-build job in official build
Error: The process '/usr/bin/git' failed with exit code 128 |
akoeplinger
added a commit
that referenced
this pull request
Dec 15, 2025
…official build Backport of #64770
akoeplinger
added a commit
that referenced
this pull request
Dec 15, 2025
…official build Backport of #64770
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1ES PT expects an object with the container image, not just the name. Use the same azureLinux30Net10BuildAmd64 container as we do in other jobs since we only build managed code.