chore: fix wasm-opt download

Author: dOrgJelli

.github/workflows/ci-containers.yaml

@@ -21,22 +21,12 @@ jobs:
           echo IMAGE_RS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm >> $GITHUB_ENV
           echo IMAGE_AS_VM_DIR=./packages/cli/src/lib/defaults/build-strategies/wasm/assemblyscript/vm >> $GITHUB_ENV
 
-      # - name: Build RS VM Image (linux/amd64)
-      #   working-directory: ${{env.IMAGE_RS_VM_DIR}}
-      #   run: |
-      #     docker buildx build . --platform=linux/amd64 --no-cache
-
-      - name: Build RS VM Image (linux/arm64)
+      - name: Build RS VM Image
         working-directory: ${{env.IMAGE_RS_VM_DIR}}
         run: |
-          docker buildx build . --platform=linux/arm64 --no-cache
-
-      - name: Build AS VM Image (linux/amd64)
-        working-directory: ${{env.IMAGE_AS_VM_DIR}}
-        run: |
-          docker buildx build . --platform=linux/amd64 --no-cache
+          docker buildx build . --platform=linux/amd64,linux/arm64
 
-      - name: Build AS VM Image (linux/arm64)
+      - name: Build AS VM Image
         working-directory: ${{env.IMAGE_AS_VM_DIR}}
         run: |
-          docker buildx build . --platform=linux/arm64 --no-cache
+          docker buildx build . --platform=linux/amd64,linux/arm64

packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts

@@ -36,7 +36,7 @@ const CONFIGS: Record<BuildableLanguage, VMConfig> = {
   "wasm/rust": {
     defaultIncludes: ["Cargo.toml", "Cargo.lock"],
     baseImage: "polywrap/vm-base-rs",
-    version: "0.2.1",
+    version: "0.2.0",
   },
   "wasm/assemblyscript": {
     defaultIncludes: ["package.json", "package-lock.json", "yarn.lock"],

packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache

@@ -11,11 +11,11 @@ RUN apk add curl pkgconfig openssl-dev bash
 # Install clang
 RUN apk add clang llvm build-base
 
-# Install Node.js
-RUN apk add --no-cache nodejs npm
-
 # Install wasm-opt
-RUN npm i wasm-opt -g
+RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \
+    && chmod +x binaryen-version_101/bin/wasm-opt \
+    && cp binaryen-version_101/bin/wasm-opt /usr/local/bin/ \
+    && rm -rf binary-version_101
 
 # Install wasm-snip
 RUN cargo install wasm-snip

packages/cli/src/lib/defaults/build-strategies/wasm/rust/local/local.sh

@@ -15,9 +15,6 @@ cargo install wasm-bindgen-cli
 # Install wasm-tools
 cargo install wasm-tools
 
-# Install wasm-opt
-RUN npm i wasm-opt -g
-
 # Ensure the module at {{dir}} has the crate-type = ["cdylib"]
 toml set "$1"/Cargo.toml lib.crate-type ["cdylib"] > "$1"/Cargo-local.toml && \
   mv "$1"/Cargo.toml "$1"/Cargo-bak.toml && \

packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile

@@ -11,11 +11,11 @@ RUN apk add curl pkgconfig openssl-dev bash
 # Install clang
 RUN apk add clang llvm build-base
 
-# Install Node.js
-RUN apk add --no-cache nodejs npm
-
 # Install wasm-opt
-RUN npm i wasm-opt -g
+RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \
+    && chmod +x binaryen-version_101/bin/wasm-opt \
+    && cp binaryen-version_101/bin/wasm-opt /usr/local/bin/ \
+    && rm -rf binary-version_101
 
 # Install wasm-snip
 RUN cargo install wasm-snip