summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurence Rowe <l@lrowe.co.uk>2023-09-12 08:33:07 -0700
committerGitHub <noreply@github.com>2023-09-12 15:33:07 +0000
commit8f0270c0cf7ed28943686325b8d329bcd2f497b2 (patch)
treed1d092c14c0bab14d58fe98e45b763769ad43126
parent08d2a32060a66e47dcccd99428d2ad13d7af29a9 (diff)
fix(devcontainer): Add build deps and update extension in devcontainer (#20467)
* Installs `cmake` and `protoc` build dependencies in the docker container. * Replaced deprecated TOML extension with its suggested alternative. Note: At least 16GB is required to build Deno, so ensure you use 'New with options' and select at least the 4-core/16GB machine type when starting in GitHub Codespaces.
-rw-r--r--.devcontainer/Dockerfile6
-rw-r--r--.devcontainer/devcontainer.json2
2 files changed, 7 insertions, 1 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c573d7b60..a82382941 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,11 @@
FROM mcr.microsoft.com/vscode/devcontainers/rust:1-bullseye
+# Install cmake and protobuf-compiler
+RUN apt-get update \
+ && apt-get install -y cmake \
+ && apt-get install -y protobuf-compiler \
+ && rm -rf /var/lib/apt/lists/*
+
# Install Deno
ENV DENO_INSTALL=/usr/local
RUN curl -fsSL https://deno.land/x/install/install.sh | sh
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 94b96a6eb..0c2a26b80 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,7 +15,7 @@
"extensions": [
"rust-lang.rust-analyzer",
- "bungcip.better-toml",
+ "tamasfe.even-better-toml",
"vadimcn.vscode-lldb",
"mutantdino.resourcemonitor"
],