Skip to content

Commit

Permalink
More install items for dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
AngelOnFira authored and Forest Anderson committed Jan 23, 2024
1 parent 84ec3ba commit 21c58ea
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 13 deletions.
9 changes: 6 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ FROM mcr.microsoft.com/devcontainers/base:bullseye

RUN apt-get update \
&& export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends git-lfs \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& apt-get -y install \
git-lfs \
libssl-dev \
pkg-config \
build-essential \
protobuf-compiler

# Install Rust
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
Expand Down
31 changes: 21 additions & 10 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,26 @@
"remoteUser": "root",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"moby": true,
"azureDnsAutoDetection": true,
"installDockerBuildx": true,
"version": "latest",
"dockerDashComposeVersion": "v2"
},
"moby": true,
"azureDnsAutoDetection": true,
"installDockerBuildx": true,
"version": "latest",
"dockerDashComposeVersion": "v2"
},
"ghcr.io/devcontainers/features/nix:1": {
"multiUser": true,
"version": "latest"
}
}
"multiUser": true,
"version": "latest"
},
"ghcr.io/devcontainers/features/rust:1": {
"version": "latest",
"profile": "default"
}
},
"customizations": {
"vscode": {
"extensions": [
"rust-lang.rust-analyzer"
]
}
}
}
15 changes: 15 additions & 0 deletions .vscode/rivet.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"folders": [
{
"path": ".."
},
{
"path": "../lib/bolt"
}
],
"settings": {
"rust-analyzer.cargo.extraEnv": {
"RUSTFLAGS": "--cfg tokio_unstable"
}
}
}

0 comments on commit 21c58ea

Please sign in to comment.