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

Add support for WASM OCI image in spin #164

Closed
wants to merge 4 commits into from
Closed

Add support for WASM OCI image in spin #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec0ac0b
oci artifact support
jsturtevant Sep 30, 2023
ae5ff42
use branches
jsturtevant Oct 6, 2023
aec24d2
Update deps
jsturtevant Oct 30, 2023
62247b3
Use spin 2.0
jsturtevant Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8,196 changes: 7,298 additions & 898 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ homepage = "https://github.com/deislabs/containerd-wasm-shims"
[workspace]
resolver = "2"
members = [
"tests"
"tests",
"containerd-shim-spin-v1"
]
22 changes: 16 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SHIMS := slight spin wws lunatic
SHIMS := spin
BUILD_TARGETS = $(foreach shim,$(SHIMS),build-$(shim)-cross-$(TARGET))

PREFIX ?= /usr/local
Expand Down Expand Up @@ -81,7 +81,7 @@ build-%:

.PHONY: install
install: $(foreach shim,$(SHIMS),build-$(shim))
sudo $(INSTALL) containerd-shim-*/target/release/containerd-shim-*-v1 $(PREFIX)/bin
sudo $(INSTALL) target/release/containerd-shim-*-v1 $(PREFIX)/bin

.PHONY: update-deps
update-deps:
Expand All @@ -96,12 +96,12 @@ test/out_%/img.tar: images/%/Dockerfile
docker buildx build --provenance=false --platform=wasi/wasm --load -t $(TEST_IMG_NAME_$*) ./images/$*
docker save -o $@ $(TEST_IMG_NAME_$*)

load: $(foreach shim,$(SHIMS),test/out_$(shim)/img.tar)
$(foreach shim,$(SHIMS),sudo ctr -n $(CONTAINERD_NAMESPACE) image import test/out_$(shim)/img.tar;)
load: $(foreach shim,$(SHIMS),test/out_$(shim)/img-oci.tar)
$(foreach shim,$(SHIMS),sudo ../containerd/bin/ctr -n $(CONTAINERD_NAMESPACE) image import --all-platforms test/out_$(shim)/img-oci.tar;)

.PHONY: run_%
run_%: install load
sudo ctr run --net-host --rm --runtime=io.containerd.$*.v1 docker.io/library/$(TEST_IMG_NAME_$*) test$*
sudo ../containerd/bin/ctr run --net-host --rm --runtime=io.containerd.$*.v1 docker.io/library/$(TEST_IMG_NAME_$*) test$*

.PHONY: clean
clean: $(addprefix clean-,$(SHIMS))
Expand All @@ -110,4 +110,14 @@ clean: $(addprefix clean-,$(SHIMS))

.PHONY: clean-%
clean-%:
cargo clean --manifest-path containerd-shim-$*-v1/Cargo.toml
cargo clean --manifest-path containerd-shim-$*-v1/Cargo.toml

.PHONY: spin-oci
spin-oci:
mkdir -p staging
docker build -o staging ./images/spin
cargo install --path ../spin

# must be spin 2.0
spin --version
spin registry push docker.io/jsturtevant/spin-wasm-shim:latest-2.0
Loading
Loading