Skip to content

Commit

Permalink
Merge pull request #3269 from albinsuresh/dev-container-updates
Browse files Browse the repository at this point in the history
dev: Update rust dev tools
  • Loading branch information
reubenmiller authored Nov 29, 2024
2 parents f94b9b3 + 77b214f commit 09aa449
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
8 changes: 7 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,13 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& pip3 install --upgrade pip --break-system-packages \
#
# Delete the dummy systemctl command added by the base image
&& rm -f /usr/local/bin/systemctl
&& rm -f /usr/local/bin/systemctl \
#
# Install rust tools
&& rustup component add rls rust-analysis rust-src rustfmt clippy \
&& rustup toolchain install nightly \
&& rustup component add rustfmt --toolchain nightly \
&& cargo install taplo-cli cargo-nextest

# Persist bash history
USER root
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
]
}
},
"postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && rustup component add rls rust-analysis rust-src rustfmt clippy",
"postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",

// Use root as there are some issues with cross using the docker commands in some environments (e.g. colima on MacOs)
"remoteUser": "root"
Expand Down
2 changes: 2 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ default:

# Install necessary tools
install-tools:
rustup component add rls rust-analysis rust-src rustfmt clippy
rustup toolchain install nightly
rustup component add rustfmt --toolchain nightly
cargo install taplo-cli cargo-nextest

Expand Down

0 comments on commit 09aa449

Please sign in to comment.