From c43840a511162e39c659f78a527e6f651d5083e8 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Mon, 12 Aug 2024 23:31:32 +0200 Subject: [PATCH 1/2] Upgrade Rust version in builders to 1.80.0; use Bookworm --- builders/Dockerfile.alpine | 2 +- builders/Dockerfile.cross | 2 +- builders/Dockerfile.debian | 2 +- builders/README.md | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/builders/Dockerfile.alpine b/builders/Dockerfile.alpine index 721eae7f..62a0dfae 100644 --- a/builders/Dockerfile.alpine +++ b/builders/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 rust:1.77.0-alpine +FROM --platform=linux/amd64 rust:1.80.0-alpine RUN apk add --no-cache ca-certificates build-base diff --git a/builders/Dockerfile.cross b/builders/Dockerfile.cross index c45c4459..f7f07497 100644 --- a/builders/Dockerfile.cross +++ b/builders/Dockerfile.cross @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 rust:1.77.0-bullseye +FROM --platform=linux/amd64 rust:1.80.0-bookworm # Install build dependencies RUN apt-get update \ diff --git a/builders/Dockerfile.debian b/builders/Dockerfile.debian index 6f8ede3c..0d3eb3bc 100644 --- a/builders/Dockerfile.debian +++ b/builders/Dockerfile.debian @@ -13,7 +13,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \ RUN wget --no-verbose "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init" \ && chmod +x rustup-init \ - && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.77.0 \ + && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.80.0 \ && rm rustup-init \ && chmod -R a+w $RUSTUP_HOME $CARGO_HOME \ && rustup --version \ diff --git a/builders/README.md b/builders/README.md index 53360ac9..d1645078 100644 --- a/builders/README.md +++ b/builders/README.md @@ -23,6 +23,11 @@ See those DockerHub repos for all available versions of the builder images. **Unreleased** +- Update Rust to 1.80.0. +- Update Dockerfile.cross from Debian Bullseye to Bookworm ([#533]) + +[#533]: https://github.com/CosmWasm/wasmvm/issues/533 + **Version 0100:** - Rename builder image from cosmwasm/go-ext-builder to From e673aa64e557be513e15daa355e4aa322d84d17d Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Mon, 12 Aug 2024 23:33:39 +0200 Subject: [PATCH 2/2] Rename .cargo/config to .cargo/config.toml to silence warning --- builders/Dockerfile.alpine | 2 +- builders/Dockerfile.cross | 2 +- builders/Dockerfile.debian | 2 +- builders/README.md | 1 + builders/guest/{cargo-config => cargo-config.toml} | 0 5 files changed, 4 insertions(+), 3 deletions(-) rename builders/guest/{cargo-config => cargo-config.toml} (100%) diff --git a/builders/Dockerfile.alpine b/builders/Dockerfile.alpine index 62a0dfae..60858b0c 100644 --- a/builders/Dockerfile.alpine +++ b/builders/Dockerfile.alpine @@ -28,6 +28,6 @@ RUN chmod +x /opt/*.sh RUN mkdir /.cargo RUN chmod +rx /.cargo -COPY guest/cargo-config /.cargo/config +COPY guest/cargo-config.toml /.cargo/config.toml CMD ["/opt/build_muslc.sh"] diff --git a/builders/Dockerfile.cross b/builders/Dockerfile.cross index f7f07497..7c2f35e4 100644 --- a/builders/Dockerfile.cross +++ b/builders/Dockerfile.cross @@ -49,6 +49,6 @@ RUN chmod +x /usr/local/bin/*.sh RUN mkdir /.cargo RUN chmod +rx /.cargo -COPY guest/cargo-config /.cargo/config +COPY guest/cargo-config.toml /.cargo/config.toml CMD ["bash", "-c", "echo 'Argument missing. Pass one build script (e.g. build_macos.sh) to docker run' && exit 1"] diff --git a/builders/Dockerfile.debian b/builders/Dockerfile.debian index 0d3eb3bc..b0774e27 100644 --- a/builders/Dockerfile.debian +++ b/builders/Dockerfile.debian @@ -31,6 +31,6 @@ RUN chmod +x /usr/local/bin/*.sh RUN mkdir /.cargo RUN chmod +rx /.cargo -COPY guest/cargo-config /.cargo/config +COPY guest/cargo-config.toml /.cargo/config.toml CMD ["bash", "-c", "echo 'Argument missing. Pass one build script (e.g. build_linux.sh) to docker run' && exit 1"] diff --git a/builders/README.md b/builders/README.md index d1645078..aea52140 100644 --- a/builders/README.md +++ b/builders/README.md @@ -25,6 +25,7 @@ See those DockerHub repos for all available versions of the builder images. - Update Rust to 1.80.0. - Update Dockerfile.cross from Debian Bullseye to Bookworm ([#533]) +- Rename `.cargo/config` to `.cargo/config.toml` to silence warning [#533]: https://github.com/CosmWasm/wasmvm/issues/533 diff --git a/builders/guest/cargo-config b/builders/guest/cargo-config.toml similarity index 100% rename from builders/guest/cargo-config rename to builders/guest/cargo-config.toml