From 01323d1b4651ea03010cdcace4c41cfddd05e793 Mon Sep 17 00:00:00 2001 From: Michael Mueller Date: Wed, 5 Mar 2025 16:03:59 +0100 Subject: [PATCH] Upgrade `contracts-verifiable` Docker image for 6.0.0-alpha --- build-image/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 4a19a80a3..5c096b5fd 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -3,7 +3,7 @@ FROM docker.io/bitnami/minideb:bullseye-amd64 as slimmed-rust # The rust version to use ARG RUST_VERSION=stable # The cargo contract version to use -ARG CARGO_CONTRACT_VERSION=4.1.0 +ARG CARGO_CONTRACT_VERSION=6.0.0-alpha # Url to the cargo-contract repository to install from ARG CARGO_CONTRACT_GIT # Branch to use in git repository @@ -19,8 +19,8 @@ ARG WGET_VERSION=1.21-1+deb11u1 # g++ package version ARG G_VERSION=4:10.2.1-1 ARG MUSL_V=1.2.2-1 -# The rust version used by linter -ARG RUST_LINTER_VERSION=nightly-2024-09-05 +# The rust version used by `ink_linting` +ARG RUST_LINTER_VERSION=nightly-2025-02-20 # metadata LABEL ink.use.image.vendor="Use Ink" \ @@ -52,7 +52,7 @@ RUN set -eux \ && url="https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init" \ && wget "$url" \ && chmod +x rustup-init \ - && ./rustup-init -y --no-modify-path --profile minimal --component rust-src rustfmt clippy --default-toolchain $RUST_VERSION \ + && ./rustup-init -y --no-modify-path --profile minimal --component rust-src,rustfmt,clippy --default-toolchain $RUST_VERSION \ && rm rustup-init \ # Install nightly toolchain required by `cargo contract build --verifiable --lint` command && rustup install ${RUST_LINTER_VERSION} --profile minimal \ @@ -105,7 +105,7 @@ RUN apt-get -y update && apt-get -y install gcc=${GCC_VERSION} g++=${G_VERSION} && cargo install cargo-dylint dylint-link \ # Check if build with linting works && cargo contract new test \ - # Generate /usr/local/dylint_drivers/nightly-2024-09-05-x86_64-unknown-linux-gnu/dylint-driver bin + # Generate /usr/local/dylint_drivers/nightly-2024-02-20-x86_64-unknown-linux-gnu/dylint-driver bin && mkdir -p $DYLINT_DRIVER_PATH \ && cd test && cargo contract build --lint --verbose --release && cd .. \ && rm -rf test \