-
Notifications
You must be signed in to change notification settings - Fork 81
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
s390x: build fedora binaries for peerpod #1678
s390x: build fedora binaries for peerpod #1678
Conversation
Fixes: confidential-containers#1640 Signed-off-by: Qi Feng Huo <[email protected]>
The Dockerfile and Makefile change was verified both on x86 and s390x host with commands like:
|
Thanks @huoqifeng
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's better to set values per arch,
cloud-api-adaptor/podvm/Dockerfile.podvm_builder.fedora
Lines 18 to 20 in cf5d30d
# amd64: YQ_CHECKSUM="sha256:bd695a6513f1196aeda17b174a15e9c351843fb1cef5f9be0af170f2dd744f08" | |
# s390x: YQ_CHECKSUM="sha256:4e6324d08630e7df733894a11830412a43703682d65a76f1fc925aac08268a45" | |
ARG YQ_CHECKSUM="sha256:bd695a6513f1196aeda17b174a15e9c351843fb1cef5f9be0af170f2dd744f08" |
and
cloud-api-adaptor/podvm/Dockerfile.podvm_builder.fedora
Lines 12 to 13 in cf5d30d
# PROTOC_ARCH="x86_64" | "s390x_64" | |
ARG PROTOC_ARCH="x86_64" |
otherwise, the file need updated before integrated into pipeline
I tested the PR, set all the values according
|
To run the builder build:
To run the binaries build against the builder image
@liudalibj s390x is not enabled yet in CI because we don't have s390x runner yet, this PR just make changes for Dockerfile/Makefile. |
With the provider args, I can built out images on s390x host with expected result:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks @huoqifeng
Fixes: confidential-containers#1640 Signed-off-by: Qi Feng Huo <[email protected]>
Makefile in podvm/mkosi is revised, so that the command can be run successfully both on x86 and s390x
|
Fixes: #1640
As a 1st step to enable mkosi images on s390x on fedora, we'll enable s390x binaries build on fedora with same Dockerfile on a s390x host in this PR.
There are other options to build s390x binaries on fedora like:
But it looks not easy, as we tried, both of the other 2 options failed. We'll track and maybe switch the approach in further PR as investigation move ahead.
In this PR, the fedora Dockerfile is revised following same format as ubuntu. It'll be more easier to maintain the Dockerfile.
To try the changes:
To run the builder build:
To run the binaries build against the builder image
Note:
BUILDER_IMG
might need be pushed to a registry before use it.