fix: Always pass --load during docker build#2335
Open
danfairs wants to merge 2 commits intoreplicate:mainfrom
Open
fix: Always pass --load during docker build#2335danfairs wants to merge 2 commits intoreplicate:mainfrom
--load during docker build#2335danfairs wants to merge 2 commits intoreplicate:mainfrom
Conversation
The requirement for —load isn’t just gated by OS/arch - it’s determined by the build driver. Signed-off-by: Dan Fairs <dan@condensereality.com>
Seems safer to just use docker’s default Signed-off-by: Dan Fairs <dan@condensereality.com>
Member
|
@danfairs I'm happy to rebase and fix conflicts with main, but I'll need permission to your fork. I want to get this in, just let me know how to help 😄 |
Contributor
Author
Thanks! I'm actually away for the next week or so but can sort this out when I'm back 👍 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This change modifies Cog so that it always passes
--loadduring docker build.Previously, it would only pass this flag if running on Apple Silicon. I don't think that is quite the right check - it is actually down to the build driver in use. Cog seems to assume that the image will always be loaded into Docker, so unconditionally passing
--loadseems to be the right thing to do.I had to include this change to allow builds to complete successfully on a self-hosted Linux GH CI runner.
I have included tests for the new behaviour, plus some coverage of existing behaviours with different
ImageBuildOptionsettings in place.Fixes #2329.