Skip to content

Commit 0ebe1cf

Browse files
authored
Merge pull request #3269 from albinsuresh/dev-container-updates
dev: Update rust dev tools
2 parents 3b43124 + 77b214f commit 0ebe1cf

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.devcontainer/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
8989
&& pip3 install --upgrade pip --break-system-packages \
9090
#
9191
# Delete the dummy systemctl command added by the base image
92-
&& rm -f /usr/local/bin/systemctl
92+
&& rm -f /usr/local/bin/systemctl \
93+
#
94+
# Install rust tools
95+
&& rustup component add rls rust-analysis rust-src rustfmt clippy \
96+
&& rustup toolchain install nightly \
97+
&& rustup component add rustfmt --toolchain nightly \
98+
&& cargo install taplo-cli cargo-nextest
9399

94100
# Persist bash history
95101
USER root

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
]
7272
}
7373
},
74-
"postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && rustup component add rls rust-analysis rust-src rustfmt clippy",
74+
"postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
7575

7676
// Use root as there are some issues with cross using the docker commands in some environments (e.g. colima on MacOs)
7777
"remoteUser": "root"

justfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ default:
4646

4747
# Install necessary tools
4848
install-tools:
49+
rustup component add rls rust-analysis rust-src rustfmt clippy
50+
rustup toolchain install nightly
4951
rustup component add rustfmt --toolchain nightly
5052
cargo install taplo-cli cargo-nextest
5153

0 commit comments

Comments
 (0)