From 2b4db7bfdc131a09308608d5b064d05848973acb Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 1 Aug 2024 13:16:50 +0200 Subject: [PATCH] devcontainer fixes (#173) --- .devcontainer/Dockerfile | 5 ++--- .devcontainer/devcontainer.json | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 62fca753..762efbba 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -11,8 +11,7 @@ # SPDX-License-Identifier: Apache-2.0 ################################################################################ -FROM mcr.microsoft.com/devcontainers/rust:1-1-bookworm - +FROM mcr.microsoft.com/devcontainers/rust:latest ARG USERNAME=vscode ARG TARGETARCH @@ -33,7 +32,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ USER ${USERNAME} # Install cargo cli tools -RUN cargo install cargo-tarpaulin --locked +RUN cargo install cargo-nextest cargo-deny cargo-tarpaulin --locked # Install cargo tools for cross compilation RUN rustup target add aarch64-unknown-linux-gnu \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b1830f16..df36ffb2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the // README at: https://github.com/devcontainers/templates/tree/main/src/rust { - "name": "uProtocol-Rust SDK", + "name": "uProtocol-Rust language library", "build": { "dockerfile": "Dockerfile" }, @@ -39,10 +39,8 @@ "hediet.vscode-drawio", "linusu.auto-dark-mode", "mhutchie.git-graph", - "redhat.vscode-yaml", "ryanluker.vscode-coverage-gutters", "rust-lang.rust-analyzer", - "serayuzgur.crates", "streetsidesoftware.code-spell-checker", "tamasfe.even-better-toml", "timonwong.shellcheck", @@ -52,7 +50,7 @@ ] } }, - "workspaceMount": "source=${localWorkspaceFolder},target=/workspace/uprotocol-rust/,type=bind", - "workspaceFolder": "/workspace/uprotocol-rust/", + "workspaceMount": "source=${localWorkspaceFolder},target=/workspace/up-rust/,type=bind", + "workspaceFolder": "/workspace/up-rust/", "remoteUser": "vscode" } \ No newline at end of file