diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile index b818013..d3effd7 100644 --- a/images/installer/Dockerfile +++ b/images/installer/Dockerfile @@ -5,9 +5,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y curl RUN mkdir -p /release/bin/ \ - && curl -L https://github.com/containerd/runwasi/releases/download/containerd-shim-wasmedge%2Fv0.3.0/containerd-shim-wasmedge-$(uname -m | sed s/arm64/aarch64/g | sed s/amd64/x86_64/g).tar.gz | tar -xzf - -C /release/bin/ \ - && curl -L https://github.com/containerd/runwasi/releases/download/containerd-shim-wasmtime%2Fv0.3.0/containerd-shim-wasmtime-$(uname -m | sed s/arm64/aarch64/g | sed s/amd64/x86_64/g).tar.gz | tar -xzf - -C /release/bin/ \ - && curl -L https://github.com/containerd/runwasi/releases/download/containerd-shim-wasmer%2Fv0.3.0/containerd-shim-wasmer-$(uname -m | sed s/arm64/aarch64/g | sed s/amd64/x86_64/g).tar.gz | tar -xzf - -C /release/bin/ + && curl -L https://github.com/containerd/runwasi/releases/download/containerd-shim-wasmedge%2Fv0.4.0/containerd-shim-wasmedge-$(uname -m | sed s/arm64/aarch64/g | sed s/amd64/x86_64/g).tar.gz | tar -xzf - -C /release/bin/ \ + && curl -L https://github.com/containerd/runwasi/releases/download/containerd-shim-wasmtime%2Fv0.4.0/containerd-shim-wasmtime-$(uname -m | sed s/arm64/aarch64/g | sed s/amd64/x86_64/g).tar.gz | tar -xzf - -C /release/bin/ \ + && curl -L https://github.com/containerd/runwasi/releases/download/containerd-shim-wasmer%2Fv0.4.0/containerd-shim-wasmer-$(uname -m | sed s/arm64/aarch64/g | sed s/amd64/x86_64/g).tar.gz | tar -xzf - -C /release/bin/ FROM ${CONTAINERD_RUNWASI} AS containerd_runwasi diff --git a/script/installer.sh b/script/installer.sh index 349d28b..1b73819 100755 --- a/script/installer.sh +++ b/script/installer.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh set -euo pipefail -KWASM_DIR=/opt/kwasm +KWASM_DIR=${KWASM_DIR:-/opt/kwasm} CONTAINERD_CONF=/etc/containerd/config.toml IS_MICROK8S=false @@ -60,9 +60,9 @@ if [ ! -f $NODE_ROOT$KWASM_DIR/active ]; then elif ls $NODE_ROOT/etc/init.d/k3s > /dev/null 2>&1 ; then nsenter --target 1 --mount --uts --ipc --net -- /etc/init.d/k3s restart elif $IS_RKE2_AGENT; then - nsenter --target 1 --mount --uts --ipc --net -- /bin/systemctl restart rke2-agent + nsenter --target 1 --mount --uts --ipc --net -- systemctl restart rke2-agent else - nsenter -m/$NODE_ROOT/proc/1/ns/mnt -- /bin/systemctl restart containerd + nsenter -m/$NODE_ROOT/proc/1/ns/mnt -- systemctl restart containerd fi else echo "No change in containerd/config.toml"