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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor cross container and bump runwasi #162

Merged
merged 3 commits into from
Oct 30, 2023

Conversation

jprendes
Copy link
Contributor

@jprendes jprendes commented Sep 24, 2023

This PR refactors and unifies the Dockerfiles used by cross-rs for the different shims.
As part of the refactor:

  • the arm neon SIMD polyfill is moved upstream.
  • runwasi is bumped to latest commit
  • libseccomp is made available in the container, as it's not required by runwasi

We also accidentally lost cgroups v1 support with #148. This PR re-enables it by bumping runwasi (which now enables it unconditionally).

Note:
There are failures running the shims when seccomp is enabled. -> fixed by bumping runwasi to include youki's UB fix.

@jprendes jprendes changed the title Refactor cross container and enable seccomp Refactor cross container ~~and enable seccomp~~ Sep 25, 2023
@jprendes jprendes changed the title Refactor cross container ~~and enable seccomp~~ Refactor cross container Sep 25, 2023
Copy link
Member

@Mossaka Mossaka left a comment

Choose a reason for hiding this comment

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

lgtm!

@jprendes
Copy link
Contributor Author

rebased

@jprendes jprendes changed the title Refactor cross container Refactor cross container and bump runwasi Oct 24, 2023
@jprendes jprendes force-pushed the refactor-cross branch 3 times, most recently from 8f7c94c to 5a8cc73 Compare October 24, 2023 13:49
@jprendes
Copy link
Contributor Author

It looks like enabling seccomp is messing with the CI tests.
The built shim does run properly when using docker, but fails when running with k3d in CI.

@jprendes jprendes force-pushed the refactor-cross branch 2 times, most recently from 343fef5 to de051f6 Compare October 26, 2023 22:59
@jprendes
Copy link
Contributor Author

It looks like enabling seccomp is messing with the CI tests.

It turns out it was a bug in upstream runwasi: containerd/runwasi#364

Everything should work fine with libseccomp now.

@Mossaka
Copy link
Member

Mossaka commented Oct 30, 2023

Thanks, @jprendes. Merging it now.

@Mossaka Mossaka merged commit 6ca8df8 into deislabs:main Oct 30, 2023
20 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.

2 participants