-
Notifications
You must be signed in to change notification settings - Fork 701
Fixed AddDockerFile to work with compute customization #6442
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
- We were not detecting containers with the build annotation and reading the image name from a parameter. Instead, it was using the runtime image name which is incorrect. - Expose DockerfileBuildAnnotation to make this possible. - Added test and updated the playground with a docker file sample
/backport to release/9.0 |
Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11473081084 |
@davidfowl backporting to release/9.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fixed AddDockerFile to work with compute customization - We were not detecting containers with the build annotation and reading the image name from a parameter. Instead, it was using the runtime image name which is incorrect. - Expose DockerfileBuildAnnotation to make this possible. - Added test and updated the playground with a docker file sample
Using index info to reconstruct a base tree...
M playground/AzureContainerApps/AzureContainerApps.AppHost/Program.cs
M src/Aspire.Hosting/PublicAPI.Unshipped.txt
M tests/Aspire.Hosting.Azure.Tests/AzureContainerAppsTests.cs
Falling back to patching base and 3-way merge...
Auto-merging tests/Aspire.Hosting.Azure.Tests/AzureContainerAppsTests.cs
Auto-merging src/Aspire.Hosting/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/Aspire.Hosting/PublicAPI.Unshipped.txt
Auto-merging playground/AzureContainerApps/AzureContainerApps.AppHost/Program.cs
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 advice.mergeConflict false"
Patch failed at 0001 Fixed AddDockerFile to work with compute customization - We were not detecting containers with the build annotation and reading the image name from a parameter. Instead, it was using the runtime image name which is incorrect. - Expose DockerfileBuildAnnotation to make this possible. - Added test and updated the playground with a docker file sample
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@davidfowl an error occurred while backporting to release/9.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
- We were not detecting containers with the build annotation and reading the image name from a parameter. Instead, it was using the runtime image name which is incorrect. - Expose DockerfileBuildAnnotation to make this possible. - Added test and updated the playground with a docker file sample
- We were not detecting containers with the build annotation and reading the image name from a parameter. Instead, it was using the runtime image name which is incorrect. - Expose DockerfileBuildAnnotation to make this possible. - Added test and updated the playground with a docker file sample
Description
Fixes #6439
Checklist
<remarks />
and<code />
elements on your triple slash comments?Microsoft Reviewers: Open in CodeFlow