bib: check that architecture is expected arch #347
Merged
Conversation
This file contains 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
mvo5
force-pushed
the
check-resolved-image-arches
branch
from
4d6bf90
to
e7f4721
Compare
cgwalters
reviewed
Apr 12, 2024
mvo5
force-pushed
the
check-resolved-image-arches
branch
2 times, most recently
from
9d23cd9
to
b5f5f66
Compare
mvo5
force-pushed
the
check-resolved-image-arches
branch
2 times, most recently
from
a93a394
to
f4bf2ac
Compare
ondrejbudai
reviewed
Apr 18, 2024
cgwalters
reviewed
Apr 18, 2024
mvo5
force-pushed
the
check-resolved-image-arches
branch
4 times, most recently
from
995d0e2
to
00fbe01
Compare
mvo5
commented
Apr 19, 2024
mvo5
force-pushed
the
check-resolved-image-arches
branch
3 times, most recently
from
3c84943
to
c3225be
Compare
mvo5
force-pushed
the
check-resolved-image-arches
branch
4 times, most recently
from
0de96ec
to
6bce9a9
Compare
github-merge-queue
bot
removed this pull request from the merge queue due to a conflict with the base branch
|
Thanks so much for this @mvo5 this was much needed! |
This is useful for cross arch container buildtesting. Note that this always pass `--arch` when doing `podman build` because without that the default behavior is to pull whatever arch was pulled for this image ref last but we want "native" if nothing else is specified. Note: This just passes `platform.uname().machine` which uses the kernel architecture names. podman seems to translate those kernel arch names to go arches automatically.
When trying to build an image with an incompatible target arch bib will currently not error because the container resolver is not very strict about the architecture request. This commit fixes this by double checking that the resolved container is actually of the expected architecture. This requires osbuild/images#585
mvo5
force-pushed
the
check-resolved-image-arches
branch
from
6bce9a9
to
bb82266
Compare
kingsleyzissou
approved these changes
Apr 23, 2024
cdrage
reviewed
Apr 26, 2024
| return nil, nil, fmt.Errorf("failed to pull container image: %w\n%s", err, output) | ||
| } | ||
| } | ||
|
|
||
| // TODO: check arch compat before pulling |
There was a problem hiding this comment.
There is a TODO added, but not removed after the commit, I have a feeling this may have broken manifest compatibility, see: osbuild/images#635 (review)
|
Reverting this commit and using @kingsleyzissou 's fixes on images, I am able to build the manifest correctly: AMD64 test: ARM64 test: |
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.
When trying to build an image with an incompatible target arch
bib will currently not error because the container resolver is
not very strict about the architecture request.
This commit fixes this by double checking that the resolved
container is actually of the expected architecture.
This requires osbuild/images#585