diff --git a/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts b/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts index 779121b9c1..b3e11d5f55 100644 --- a/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts +++ b/packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts @@ -29,16 +29,19 @@ const DEFAULTS_DIR = path.join( export interface VMConfig { defaultIncludes: string[]; baseImage: string; + version: string; } const CONFIGS: Record = { "wasm/rust": { defaultIncludes: ["Cargo.toml", "Cargo.lock"], baseImage: "polywrap/vm-base-rs", + version: "0.2.0", }, "wasm/assemblyscript": { defaultIncludes: ["package.json", "package-lock.json", "yarn.lock"], baseImage: "polywrap/vm-base-as", + version: "0.1.0", }, }; @@ -194,7 +197,7 @@ export class DockerVMBuildStrategy extends BuildStrategy { this._volumePaths.linkedPackages )}:/linked-packages`, cacheVolume, - `${CONFIGS[language].baseImage}:latest`, + `${CONFIGS[language].baseImage}:${process.arch}-${CONFIGS[language].version}`, "/bin/bash", "--verbose", "/project/polywrap-build.sh", @@ -221,7 +224,7 @@ export class DockerVMBuildStrategy extends BuildStrategy { `${path.resolve( this._volumePaths.linkedPackages )}:/linked-packages`, - `${CONFIGS[language].baseImage}:latest`, + `${CONFIGS[language].baseImage}:${process.arch}-${CONFIGS[language].version}`, "/bin/bash", "-c", '"chmod -R 777 /project && chmod -R 777 /linked-packages"', diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache index 08e32490bf..e5721098e8 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/image/Dockerfile.mustache @@ -1,4 +1,4 @@ -FROM rust:1.65.0 as base +FROM rust:1.66-alpine as base # Install the wasm32 rust build target RUN rustup target add wasm32-unknown-unknown @@ -6,8 +6,7 @@ RUN rustup target add wasm32-unknown-unknown WORKDIR /build-deps # Install curl -RUN apt-get update -RUN apt-get -y install curl clang llvm build-essential +RUN apk add curl build-base pkgconfig openssl-dev bash # Install wasm-opt RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \ diff --git a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile index dfb2ba79e1..f6d80bebef 100644 --- a/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile +++ b/packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.65.0 as base +FROM rust:1.66-alpine as base # Install the wasm32 rust build target RUN rustup target add wasm32-unknown-unknown @@ -6,8 +6,7 @@ RUN rustup target add wasm32-unknown-unknown WORKDIR /build-deps # Install curl -RUN apt-get update -RUN apt-get -y install curl clang llvm build-essential +RUN apk add curl build-base pkgconfig openssl-dev bash # Install wasm-opt RUN curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz \