diff --git a/docker/Makefile b/docker/Makefile index ac5ffefd6..dd92d2c9e 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,4 +1,4 @@ -VERSION = v23.07 +VERSION = v23.09 IMAGE ?= veracruz CONTAINER ?= veracruz VERACRUZ_ROOT ?= .. @@ -6,7 +6,7 @@ USER ?= $(shell id -un) UID ?= $(shell id -u) OS_NAME := $(shell uname -s | tr A-Z a-z) ARCH = $(shell uname -m) -AWS_NITRO_CLI_REVISION = v1.2.1 +AWS_NITRO_CLI_REVISION = v1.2.2 ifeq ($(OS_NAME),darwin) LOCALIP = $(shell "(ifconfig en0 ; ifconfig en1) | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}'") diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 3b9b1be3b..337f6d1df 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -118,16 +118,16 @@ RUN apt-get update && \ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.66.0 + RUST_VERSION=1.70.0 RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)"; \ case "${dpkgArch##*-}" in \ - amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338' ;; \ - arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='32a1532f7cef072a667bac53f1a5542c99666c4071af0c9549795bbdb2069ec1' ;; \ + amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ - url="https://static.rust-lang.org/rustup/archive/1.24.3/${rustArch}/rustup-init"; \ + url="https://static.rust-lang.org/rustup/archive/1.26.0/${rustArch}/rustup-init"; \ wget "$url"; \ echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init; \ diff --git a/docker/ci/Dockerfile.cache b/docker/ci/Dockerfile.cache index 986e2d80d..67141fe93 100644 --- a/docker/ci/Dockerfile.cache +++ b/docker/ci/Dockerfile.cache @@ -18,8 +18,10 @@ ARG VERSION="latest" FROM veracruz/ci-base:${VERSION} as final ARG ARCH=x86_64 +ARG WASM_RUST_VERSION=1.66.1 -RUN rustup target add ${ARCH}-unknown-linux-musl wasm32-wasi && \ +RUN rustup target add ${ARCH}-unknown-linux-musl && \ + rustup toolchain install ${WASM_RUST_VERSION} --target wasm32-wasi && \ cargo install empty-library || true # Load crates.io index WORKDIR /work diff --git a/docker/ci/Dockerfile.local b/docker/ci/Dockerfile.local index a1f5125c6..27f2b4a38 100644 --- a/docker/ci/Dockerfile.local +++ b/docker/ci/Dockerfile.local @@ -17,8 +17,10 @@ ARG VERSION="latest" FROM veracruz/ci-base:${VERSION} as final ARG ARCH=x86_64 +ARG WASM_RUST_VERSION=1.66.1 -RUN rustup target add ${ARCH}-unknown-linux-musl wasm32-wasi && \ +RUN rustup target add ${ARCH}-unknown-linux-musl && \ + rustup toolchain install ${WASM_RUST_VERSION} --target wasm32-wasi && \ rustup component add rustfmt WORKDIR /work diff --git a/docs/CLI_QUICKSTART.md b/docs/CLI_QUICKSTART.md index 095531e95..a877f44d1 100644 --- a/docs/CLI_QUICKSTART.md +++ b/docs/CLI_QUICKSTART.md @@ -63,11 +63,11 @@ Veracruz supports the direct execution of non-WebAssembly native code via the compile the example to WebAssembly, which Rust makes very easy for us: ``` bash -$ cargo build \ - --manifest-path=workspaces/applications/Cargo.toml \ +$ (cd workspaces/applications ; \ + cargo build \ --target wasm32-wasi \ --release \ - --package shamir-secret-sharing + --package shamir-secret-sharing) ``` You should now find the example compiled to WebAssembly in the `target/wasm32-wasi/release` diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index b6148bc0a..000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.66.0 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 000000000..a895dea5d --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.70.0" +components = [ "rustfmt" ] diff --git a/workspaces/applications/rust-toolchain.toml b/workspaces/applications/rust-toolchain.toml index c0e5312d1..639fde04d 100644 --- a/workspaces/applications/rust-toolchain.toml +++ b/workspaces/applications/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.66.0" +channel = "1.66.1" components = [ "rustfmt" ] targets = [ "wasm32-wasi" ]