Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dev-container templating #70

Merged
merged 3 commits into from
Jan 9, 2025

Conversation

jazzz
Copy link
Contributor

@jazzz jazzz commented Jan 8, 2025

Problem

The dev-container option (set using esp-generate --chip esp32 -o dev-container your-project) does not generate a valid dev-container configuration. The templated parameters are never substituted, which leads to syntax errors, when opening the container.

This PR updates the dev-container.json file template to use the key/value based substitution found in other files.

Comment on lines -57 to -59
# Set default toolchain
RUN rustup default {{ toolchain }}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting the default value for rustup appears to irrelevant as the value is overwritten by rust-toolchain.toml.

rustup show
...
esp (overridden by '/home/esp/project-name/rust-toolchain.toml')
...

Removing so there is less confusion for new developers.

@jazzz jazzz marked this pull request as ready for review January 8, 2025 19:01
Copy link
Member

@SergioGasquez SergioGasquez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for fixing it!

@SergioGasquez SergioGasquez added this pull request to the merge queue Jan 9, 2025
Merged via the queue into esp-rs:main with commit 19c9767 Jan 9, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants