update Cargo.lock and fix some bugs in Makefile

Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
deislabs · Nov 7, 2023 · a3ccec0 · a3ccec0
1 parent cd15936
commit a3ccec0
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/containerd-shim-lunatic/Cargo.lock b/containerd-shim-lunatic/Cargo.lock
diff --git a/containerd-shim-lunatic/Cargo.toml b/containerd-shim-lunatic/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", tag = "containerd-shim-wasm/v0.4.0" }
+containerd-shim-wasm = { git = "https://github.com/mossaka/runwasi", rev = "25ff925e9b2c50d1d72b79a3003b381a599c0b65" }
 log = "~0.4"
 anyhow = "1.0.72"
 chrono = { version = "0.4.26", features = ["std"] }

diff --git a/containerd-shim-slight/Cargo.lock b/containerd-shim-slight/Cargo.lock
diff --git a/containerd-shim-slight/Cargo.toml b/containerd-shim-slight/Cargo.toml
@@ -11,7 +11,7 @@ Containerd shim for running Slight workloads.
 """
 
 [dependencies]
-containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", tag = "containerd-shim-wasm/v0.4.0" }
+containerd-shim-wasm = { git = "https://github.com/mossaka/runwasi", rev = "25ff925e9b2c50d1d72b79a3003b381a599c0b65" }
 log = "0.4"
 tokio = { version = "1", features = [ "full" ] }
 slight = { git = "https://github.com/deislabs/spiderlightning", version = "0.5.1" }

diff --git a/containerd-shim-slight/src/main.rs b/containerd-shim-slight/src/main.rs
@@ -4,5 +4,5 @@ use containerd_shim_wasm::sandbox::cli::{revision, shim_main, version};
 mod engine;
 
 fn main() {
-    shim_main::<Instance<engine::SlightEngine>>("slight", version!(), revision!(), None);
+    shim_main::<Instance<engine::SlightEngine>>("slight", version!(), revision!(), None, None);
 }
diff --git a/containerd-shim-spin/Cargo.lock b/containerd-shim-spin/Cargo.lock
diff --git a/containerd-shim-spin/Cargo.toml b/containerd-shim-spin/Cargo.toml
@@ -11,7 +11,7 @@ Containerd shim for running Spin workloads.
 """
 
 [dependencies]
-containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", tag = "containerd-shim-wasm/v0.4.0" }
+containerd-shim-wasm = { git = "https://github.com/mossaka/runwasi", rev = "25ff925e9b2c50d1d72b79a3003b381a599c0b65" }
 log = "0.4"
 spin-app = { git = "https://github.com/fermyon/spin", tag = "v2.0.0" }
 spin-core = { git = "https://github.com/fermyon/spin", tag = "v2.0.0" }

diff --git a/containerd-shim-spin/src/main.rs b/containerd-shim-spin/src/main.rs
@@ -4,5 +4,5 @@ use containerd_shim_wasm::sandbox::cli::{revision, shim_main, version};
 mod engine;
 
 fn main() {
-    shim_main::<Instance<engine::SpinEngine>>("spin", version!(), revision!(), None);
+    shim_main::<Instance<engine::SpinEngine>>("spin", version!(), revision!(), Some("v2"), None);
 }
diff --git a/containerd-shim-wws/Cargo.lock b/containerd-shim-wws/Cargo.lock
diff --git a/containerd-shim-wws/Cargo.toml b/containerd-shim-wws/Cargo.toml
@@ -14,7 +14,7 @@ Containerd shim for running Wasm Workers Server workloads.
 
 [dependencies]
 anyhow = "1.0"
-containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", tag = "containerd-shim-wasm/v0.4.0" }
+containerd-shim-wasm = { git = "https://github.com/mossaka/runwasi", rev = "25ff925e9b2c50d1d72b79a3003b381a599c0b65" }
 wasm-workers-server = { git = "https://github.com/vmware-labs/wasm-workers-server", tag = "v1.7.0" }
 log = "0.4"
 tokio = { version = "1", features = [ "full" ] }

diff --git a/containerd-shim-wws/src/main.rs b/containerd-shim-wws/src/main.rs
@@ -4,5 +4,5 @@ use containerd_shim_wasm::sandbox::cli::{revision, shim_main, version};
 mod engine;
 
 fn main() {
-    shim_main::<Instance<engine::WwsEngine>>("wws", version!(), revision!(), None);
+    shim_main::<Instance<engine::WwsEngine>>("wws", version!(), revision!(), None, None);
 }
diff --git a/deployments/k3d/Makefile b/deployments/k3d/Makefile
@@ -1,5 +1,5 @@
 SHIMS = spin slight wws lunatic
-
+SPIN_VERSION = v2
 IMAGE_NAME ?= k3swithshims
 CLUSTER_NAME ?= k3s-default
 PLATFORM ?= linux/amd64
@@ -15,8 +15,10 @@ compile-musl-%:
 
 move-musl-to-tmp: $(addprefix compile-musl-,$(SHIMS))
 	mkdir -p ./.tmp
-	$(foreach shim,$(SHIMS),cp ../../containerd-shim-$(shim)-v1/target/$(TARGET)/release/containerd-shim-*-v1 ./.tmp/;)
-
+	cp ../../containerd-shim-spin/target/$(TARGET)/release/containerd-shim-spin-$(SPIN_VERSION) ./.tmp/
+	cp ../../containerd-shim-slight/target/$(TARGET)/release/containerd-shim-slight-v1 ./.tmp/
+	cp ../../containerd-shim-wws/target/$(TARGET)/release/containerd-shim-wws-v1 ./.tmp/
+	cp ../../containerd-shim-lunatic/target/$(TARGET)/release/containerd-shim-lunatic-v1 ./.tmp/
 
 build-multi-k3d-image: move-musl-to-tmp
 	docker buildx build -t $(IMAGE_NAME) --platform linux/amd64,linux/arm64 .

diff --git a/scripts/move-bins.sh b/scripts/move-bins.sh
@@ -20,28 +20,29 @@
 set -euo pipefail
 
 target="${2:-x86_64-unknown-linux-musl}"
-release_pattern="${1:-containerd-shim-%s-v1/target/$target/release}"
+release_pattern="${1:-containerd-shim-%s/target/$target/release}"
 
 dockerfile_path="deployments/k3d"
 bin_path="${dockerfile_path}/.tmp/"
 cluster_name="test-cluster"
-default_shim_path="${bin_path}containerd-shim-"
 
 declare -A shims=(
-    [slight]="${default_shim_path}slight-v1"
-    [spin]="${default_shim_path}spin-v2"
-    [wws]="${default_shim_path}wws-v1"
-    [lunatic]="${default_shim_path}lunatic-v1"
+    [slight]="v1"
+    [spin]="v2"
+    [wws]="v1"
+    [lunatic]="v1"
 )
 
 mkdir -p "$bin_path"
 
 for shim_key in "${!shims[@]}"; do
-    shim_path=${shims[$shim_key]}
+    version=${shims[$shim_key]}
+    release_bin="containerd-shim-${shim_key}-${version}"
+    shim_path="${bin_path}${release_bin}"
     release_path=$(printf "$release_pattern" "$shim_key")
 
     if [ ! -f "$shim_path" ]; then
-        echo ">>> install containerd-shim-${shim_key}-v1 from $release_path"
-        cp "$(eval echo $release_path)/containerd-shim-${shim_key}-v1" "${bin_path}containerd-shim-${shim_key}-v1"
+        echo ">>> install $release_bin from $release_path"
+        cp "$release_path/$release_bin" "$shim_path"
     fi
-done
+done