Update deps

Signed-off-by: James Sturtevant <[email protected]>

Author: jsturtevant

Makefile

@@ -116,12 +116,8 @@ clean-%:
 spin-oci:
 	mkdir -p staging
 	docker build -o staging ./images/spin
-	cargo install --path ../runwasi/crates/oci-tar-builder 
+	cargo install --path ../spin
 
-	# spin.json generated by spin registry push docker.io/jsturtevant/spin-wasm-shim:latest and looking at config
-	# must be updated if the app changes.
-	oci-tar-builder --name wasmtest_spin --repo docker.io/library --tag latest \
-		--module ./staging/spin_rust_hello.wasm \
-		--module ./staging/spin_go_hello.wasm \
-		--layer application/vnd.fermyon.spin.application.v1+config=./staging/spin.json \
-		-o test/out_spin/img-oci.tar
+	# must be spin 2.0
+	spin --version
+	spin registry push docker.io/jsturtevant/spin-wasm-shim:latest-2.0

containerd-shim-spin-v1/Cargo.toml

@@ -14,13 +14,13 @@ Containerd shim for running Spin workloads.
 containerd-shim = "0.6.0"
 containerd-shim-wasm =  "0.4.0"
 log = "0.4"
-spin-trigger = { git = "https://github.com/jsturtevant/spin", branch = "spin-oci" }
-spin-trigger-http = { git = "https://github.com/jsturtevant/spin", branch = "spin-oci" }
-spin-redis-engine ={ git = "https://github.com/jsturtevant/spin", branch = "spin-oci" }
-spin-manifest = { git = "https://github.com/jsturtevant/spin", branch = "spin-oci" }
-spin-loader = { git = "https://github.com/jsturtevant/spin", branch = "spin-oci" }
-spin-app = { git = "https://github.com/jsturtevant/spin", branch = "spin-oci" }
-spin-oci = { git = "https://github.com/jsturtevant/spin", branch = "spin-oci" }
+spin-trigger = { git = "https://github.com/jsturtevant/spin", rev = "1856ba8971f93beae5fe1f8e2e0961d7ad50d493" }
+spin-trigger-http = { git = "https://github.com/jsturtevant/spin", rev = "1856ba8971f93beae5fe1f8e2e0961d7ad50d493" }
+spin-redis-engine ={ git = "https://github.com/jsturtevant/spin", rev = "1856ba8971f93beae5fe1f8e2e0961d7ad50d493" }
+spin-manifest = { git = "https://github.com/jsturtevant/spin", rev = "1856ba8971f93beae5fe1f8e2e0961d7ad50d493" }
+spin-loader = { git = "https://github.com/jsturtevant/spin", rev = "1856ba8971f93beae5fe1f8e2e0961d7ad50d493" }
+spin-app = { git = "https://github.com/jsturtevant/spin", rev = "1856ba8971f93beae5fe1f8e2e0961d7ad50d493" }
+spin-oci = { git = "https://github.com/jsturtevant/spin", rev = "1856ba8971f93beae5fe1f8e2e0961d7ad50d493" }
 wasmtime = "10.0.1"
 tokio = { version = "1", features = ["rt"] }
 openssl = { version = "*", features = ["vendored"] }

containerd-shim-spin-v1/src/engine.rs

@@ -120,7 +120,7 @@ impl SpinEngine {
                             .write_all(&artifact.layer)
                             .context("failed to write spin.json")?;
                     },
-                    MediaType::Other(name) if name == WASM_LAYER_MEDIA_TYPE  => {
+                    MediaType::Other(name) if name == "application/vnd.wasm.content.layer.v1+wasm"  => {
                         log::info!("writing artifact config to cache, near {:?}", cache.manifests_dir());
                         cache.write_wasm(&artifact.layer, &artifact.config.digest()).await?;
                     },