Skip to content

feat: KWASM_DIR configurable #59

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

Open
trutx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: KWASM_DIR configurable #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions images/installer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions script/installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand Down