Merge pull request #552 from CosmWasm/sw/rust-1.80

Bump to Rust 1.80 and other build system cleanups

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
 
@@ -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"]

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 \
@@ -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"]

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 \
@@ -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"]

builders/README.md

@@ -23,6 +23,12 @@ 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])
+- Rename `.cargo/config` to `.cargo/config.toml` to silence warning
+
+[#533]: https://github.com/CosmWasm/wasmvm/issues/533
+
 **Version 0100:**
 
 - Rename builder image from cosmwasm/go-ext-builder to