diff --git a/rust-nostd-avr/Dockerfile b/rust-nostd-avr/Dockerfile index db59542..4155a84 100644 --- a/rust-nostd-avr/Dockerfile +++ b/rust-nostd-avr/Dockerfile @@ -29,7 +29,7 @@ RUN cargo --version RUN rustup show # Install extra crates -RUN cargo install cargo-audit cargo-generate +RUN cargo install cargo-audit@0.17.6 cargo-generate # Generate project templates RUN cargo generate -a Rahix/avr-hal-template --name rust-project-uno --vcs none --silent -d board="Arduino Uno" diff --git a/rust-nostd-avr/compile.sh b/rust-nostd-avr/compile.sh index 37bb741..8be60d9 100755 --- a/rust-nostd-avr/compile.sh +++ b/rust-nostd-avr/compile.sh @@ -32,5 +32,5 @@ fi cargo audit cargo build --release --out-dir output -Z unstable-options -avr-objcopy -R .eeprom -O ihex ./target/${MCU}/release/${PROJECT_NAME}.elf ${HOME}/build-out/project.hex +avr-objcopy -R .eeprom -O ihex ./target/${MCU}/release/${PROJECT_NAME}.elf ${HOME}/build-out/project.hex cp ./target/${MCU}/release/${PROJECT_NAME}.elf ${HOME}/build-out/project.elf diff --git a/rust-nostd-esp/Dockerfile b/rust-nostd-esp/Dockerfile index f634d02..5045b4d 100644 --- a/rust-nostd-esp/Dockerfile +++ b/rust-nostd-esp/Dockerfile @@ -1,10 +1,10 @@ -FROM espressif/idf-rust:all_1.72.0.0 +FROM espressif/idf-rust:all_1.73.0.0 USER esp ENV USER=esp # Install extra crates -RUN cargo install cargo-audit && \ +RUN cargo install cargo-audit@0.17.6 && \ GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \ curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-${GENERATE_VERSION}-x86_64-unknown-linux-gnu.tar.gz" -o "${HOME}/.cargo/bin/cargo-generate.tar.gz" && \ tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \ diff --git a/rust-std-esp/Dockerfile b/rust-std-esp/Dockerfile index 816aafd..ca9ef12 100644 --- a/rust-std-esp/Dockerfile +++ b/rust-std-esp/Dockerfile @@ -1,10 +1,10 @@ -FROM espressif/idf-rust:all_1.72.0.0 +FROM espressif/idf-rust:all_1.73.0.0 USER esp ENV USER=esp # Install extra crates -RUN cargo install cargo-audit && \ +RUN cargo install cargo-audit@0.17.6 && \ GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \ curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-${GENERATE_VERSION}-x86_64-unknown-linux-gnu.tar.gz" -o "${HOME}/.cargo/bin/cargo-generate.tar.gz" && \ tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \