Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix multiarch buildah command #2943

Merged
merged 1 commit into from
Mar 21, 2024
Merged

fix multiarch buildah command #2943

merged 1 commit into from
Mar 21, 2024

Conversation

Qusic
Copy link
Contributor

@Qusic Qusic commented Mar 20, 2024

follow up fix for #2757 馃槼

It seems the newly published images are single-arch. Went through a few manuals and it turned out that we should use --manifest instead of --tag.
Also buildah doesn't supports more than one --manifest arguments in one build, so we have to build each (v5, v5.15, v5.15.0, etc) separately even if they are identical images/manifests.

Ideally we can move downloadAssets.sh's logic into Containerfile itself so we can build for multiple archs concurrently. However that would be a big change and I'd rather leave it as is for now.

Copy link
Contributor

@xiaokangwang xiaokangwang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this merge request is ready to be merged.

I might rewrite this in the future to improve it. For now, since we are not building anything in the container, it should be fine even we are doing things sequentially.

BTW: we couldn't move download to the container, as we are building cross building without emulator, the RUN command is not available.

@Qusic
Copy link
Contributor Author

Qusic commented Mar 21, 2024

@xiaokangwang please help merge this. I don't have write access to this repo and cannot merge it myself. Thanks!

As for future improvements, I suggest we use workflow artifacts to store built binaries and only upload to github release or push to registry on release event. This way we can include container building as part of pull request validation and make it easier to test changes.

@xiaokangwang xiaokangwang merged commit c7459b3 into v2fly:master Mar 21, 2024
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants