Skip to content

Commit

Permalink
devcontainer fixes (#173)
Browse files Browse the repository at this point in the history
  • Loading branch information
AnotherDaniel authored Aug 1, 2024
1 parent 4b7526a commit 2b4db7b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
5 changes: 2 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 \
Expand Down
8 changes: 3 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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"
}

0 comments on commit 2b4db7b

Please sign in to comment.