Add support for WASM OCI image in spin

Cargo.toml

@@ -10,5 +10,6 @@ homepage = "https://github.com/deislabs/containerd-wasm-shims"
 [workspace]
 resolver = "2"
 members = [
-    "tests"
+    "tests",
+    "containerd-shim-spin-v1"
 ]

Makefile

@@ -1,4 +1,4 @@
-SHIMS := slight spin wws lunatic
+SHIMS := spin
 BUILD_TARGETS = $(foreach shim,$(SHIMS),build-$(shim)-cross-$(TARGET))
 
 PREFIX ?= /usr/local
@@ -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:
@@ -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))
@@ -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