From 258794a57ef99b888c837cbd97070fd0073191ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= Date: Mon, 17 Mar 2025 12:37:47 +0100 Subject: [PATCH 1/2] Add python and npm to Dockerfile.codespaces --- .devcontainer/Dockerfile.codespaces | 5 +++++ .devcontainer/devcontainer.json | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/Dockerfile.codespaces diff --git a/.devcontainer/Dockerfile.codespaces b/.devcontainer/Dockerfile.codespaces new file mode 100644 index 000000000000..0dbac7050094 --- /dev/null +++ b/.devcontainer/Dockerfile.codespaces @@ -0,0 +1,5 @@ +FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04 + +USER root +RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y sudo man-db python3.12 npm unminimize +RUN yes | unminimize diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a51284e3a1f6..61595e152b7f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,4 @@ { - "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04", "extensions": [ "rust-lang.rust-analyzer", "bungcip.better-toml", @@ -8,6 +7,10 @@ "ms-vscode.test-adapter-converter", "slevesque.vscode-zipexplorer" ], + "build": { + // Path is relative to the devcontainer.json file. + "dockerfile": "Dockerfile.codespaces" + }, "settings": { "files.watcherExclude": { "**/target/**": true From 319b781ce32b998474570b20e98f96f5965a4a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= Date: Mon, 17 Mar 2025 15:57:32 +0100 Subject: [PATCH 2/2] Add reference to official codeql system requirements doc --- .devcontainer/Dockerfile.codespaces | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.devcontainer/Dockerfile.codespaces b/.devcontainer/Dockerfile.codespaces index 0dbac7050094..89a80f6acd5e 100644 --- a/.devcontainer/Dockerfile.codespaces +++ b/.devcontainer/Dockerfile.codespaces @@ -1,5 +1,7 @@ FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04 USER root +# Install needed packages according to https://codeql.github.com/docs/codeql-overview/system-requirements/ +# most come from the base image, but we need to install some additional ones RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y sudo man-db python3.12 npm unminimize RUN yes | unminimize