Skip to content

Commit 2d4d707

Browse files
fix(rust-esp): fix esp builders (#64)
* feat: Update base image and cargo-audit version * feat: Add -a flag
1 parent 6d74604 commit 2d4d707

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

rust-nostd-esp/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM espressif/idf-rust:all_1.77.0.0
1+
FROM espressif/idf-rust:all_1.78.0.0
22

33
USER esp
44
ENV USER=esp
55

66
# Install extra crates
7-
RUN cargo install cargo-audit@0.17.6 && \
7+
RUN cargo install cargo-audit && \
88
GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \
99
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" && \
1010
tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \
@@ -13,12 +13,12 @@ RUN cargo install [email protected] && \
1313
chmod u+x "${HOME}/.cargo/bin/rnamer"
1414

1515
# Generate project templates
16-
RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32 -d mcu=esp32 -d advanced=false
17-
RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32c3 -d mcu=esp32c3 -d advanced=false
18-
RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32c6 -d mcu=esp32c6 -d advanced=false
19-
RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32h2 -d mcu=esp32h2 -d advanced=false
20-
RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32s2 -d mcu=esp32s2 -d advanced=false
21-
RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32s3 -d mcu=esp32s3 -d advanced=false
16+
RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32 -d mcu=esp32 -d advanced=false
17+
RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32c3 -d mcu=esp32c3 -d advanced=false
18+
RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32c6 -d mcu=esp32c6 -d advanced=false
19+
RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32h2 -d mcu=esp32h2 -d advanced=false
20+
RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32s2 -d mcu=esp32s2 -d advanced=false
21+
RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32s3 -d mcu=esp32s3 -d advanced=false
2222

2323
# Add alloc to the build-std property
2424
RUN find . -name "config.toml" -type f -exec sed -i 's/build-std = \["core"\]/build-std = \["alloc", "core"\]/g' {} +

rust-nostd-esp/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ runner = "espflash flash --monitor"
44

55
[build]
66
rustflags = [
7-
"-C", "link-arg=-Tlinkall.x",
87
"-C", "force-frame-pointers",
98
]
109

rust-std-esp/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM espressif/idf-rust:all_1.77.0.0
1+
FROM espressif/idf-rust:all_1.78.0.0
22

33
USER esp
44
ENV USER=esp
55

66
# Install extra crates
7-
RUN cargo install cargo-audit@0.17.6 && \
7+
RUN cargo install cargo-audit && \
88
GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \
99
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" && \
1010
tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \

0 commit comments

Comments
 (0)