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.

Sign up for GitHub

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

Jump to bottom

Pass the containerd address into shim #192

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Pass the containerd address into shim #192

merged 1 commit into from
Jul 26, 2023

Conversation

jsturtevant
Copy link
Contributor

This updates Rust-extensions dep to include containerd/rust-extensions#150 which enables using containerd from within the shim. This is in perp for handling oci artifacts that will be stored in the containerd content store in which we need the containerd address.

@jsturtevant
Copy link
Contributor Author

seems like CI might be broken after #187

   Dirty wasmedge-sys v0.15.0: the file `/usr/lib/llvm-14/lib/clang/14.0.0/include/stdbool.h` is missing
   Compiling wasmedge-sys v0.15.0
     Running `/home/runner/work/runwasi/runwasi/target/debug/build/wasmedge-sys-24c4a5d29523e79f/build-script-build`
error: failed to run custom build command for `wasmedge-sys v0.15.0`
note: To improve backtraces for build dependencies, set the CARGO_PROFILE_DEV_BUILD_OVERRIDE_DEBUG=true environment variable to enable debug information generation.

Caused by:
  process didn't exit successfully: `/home/runner/work/runwasi/runwasi/target/debug/build/wasmedge-sys-24c4a5d29523e79f/build-script-build` (exit status: 1)
  --- stderr
  /home/runner/work/runwasi/runwasi/target/debug/build/wasmedge-sys-24c4a5d29523e79f/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.32' not found (required by /home/runner/work/runwasi/runwasi/target/debug/build/wasmedge-sys-24c4a5d29523e79f/build-script-build)
  /home/runner/work/runwasi/runwasi/target/debug/build/wasmedge-sys-24c4a5d29523e79f/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.33' not found (required by /home/runner/work/runwasi/runwasi/target/debug/build/wasmedge-sys-24c4a5d29523e79f/build-script-build)
  /home/runner/work/runwasi/runwasi/target/debug/build/wasmedge-sys-24c4a5d29523e79f/build-script-build: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by /home/runner/work/runwasi/runwasi/target/debug/build/wasmedge-sys-24c4a5d29523e79f/build-script-build)
warning: build failed, waiting for other jobs to finish...

@jsturtevant jsturtevant mentioned this pull request Jul 21, 2023
Closed
@jprendes
Copy link
Collaborator

@jsturtevant #193 has been fixed. It should work now after rebasing your changes.

@jsturtevant jsturtevant force-pushed the use-shim-args branch 2 times, most recently from 210d78f to 7bfcc55 Compare July 24, 2023 17:28
@jsturtevant jsturtevant mentioned this pull request Jul 24, 2023
Merged
ipuustin
ipuustin approved these changes Jul 25, 2023
View reviewed changes
Copy link
Contributor

@ipuustin ipuustin left a comment

Choose a reason for hiding this comment

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

LGTM!

Mossaka
Mossaka approved these changes Jul 26, 2023
View reviewed changes
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!

@Mossaka Mossaka merged commit 006b95f into containerd:main Jul 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@ipuustin ipuustin ipuustin approved these changes

@Mossaka Mossaka Mossaka approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jsturtevant @jprendes @cpuguy83 @ipuustin @Mossaka