From 846a3a16e241ce53ad2c9756014c97204059b8b8 Mon Sep 17 00:00:00 2001
From: Totto16 <tobiausgais@gmail.com>
Date: Fri, 11 Oct 2024 20:03:41 +0200
Subject: [PATCH] Meta: Update the devcontainer configuration

Update the base image and the feature images
Add new packages to the install.sh command
as they are now needed by some dependencies, that are built via vcpkg
Add newer clang version, but the default stays the same
---
 .devcontainer/devcontainer.json                           | 4 ++--
 .devcontainer/features/ladybird/devcontainer-feature.json | 1 +
 .devcontainer/features/ladybird/install.sh                | 2 +-
 Documentation/BuildInstructionsLadybird.md                | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c0a0475e1dd..08bd343eae0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,11 +1,11 @@
 {
     "name": "Ladybird",
-    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "image": "mcr.microsoft.com/devcontainers/base:noble",
 
     // Features to add to the dev container. More info: https://containers.dev/implementors/features.
     "features": {
         "ghcr.io/devcontainers/features/github-cli:1": {},
-        "ghcr.io/devcontainers-contrib/features/pre-commit:1": {},
+        "ghcr.io/devcontainers-contrib/features/pre-commit:2": {},
         "./features/ladybird": {
             "llvm_version": 18,
         },
diff --git a/.devcontainer/features/ladybird/devcontainer-feature.json b/.devcontainer/features/ladybird/devcontainer-feature.json
index 94d496f9560..6209ae743eb 100644
--- a/.devcontainer/features/ladybird/devcontainer-feature.json
+++ b/.devcontainer/features/ladybird/devcontainer-feature.json
@@ -9,6 +9,7 @@
             "proposals": [
                 17,
                 18,
+                19,
                 "trunk"
             ],
             "default": 18,
diff --git a/.devcontainer/features/ladybird/install.sh b/.devcontainer/features/ladybird/install.sh
index cf9694d07b6..273e72eebe3 100755
--- a/.devcontainer/features/ladybird/install.sh
+++ b/.devcontainer/features/ladybird/install.sh
@@ -28,7 +28,7 @@ install_llvm_key() {
 ### Install packages
 
 apt update -y
-apt install -y lsb-release git python3 autoconf autoconf-archive automake build-essential cmake libavcodec-dev libgl1-mesa-dev ninja-build qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev qt6-wayland ccache fonts-liberation2 zip unzip curl tar
+apt install -y lsb-release git python3 autoconf autoconf-archive automake build-essential cmake libavcodec-dev libavformat-dev libavutil-dev libgl1-mesa-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev qt6-wayland ccache fonts-liberation2 zip unzip curl tar
 ### Ensure new enough host compiler is available
 
 VERSION="0.0.0"
diff --git a/Documentation/BuildInstructionsLadybird.md b/Documentation/BuildInstructionsLadybird.md
index d119e94111f..410c4419fad 100644
--- a/Documentation/BuildInstructionsLadybird.md
+++ b/Documentation/BuildInstructionsLadybird.md
@@ -13,6 +13,7 @@ CMake 3.25 or newer must be available in $PATH.
 
 ### Debian/Ubuntu:
 
+<!-- Note: If you change something here, please also change it in the `devcontainer/devcontainer.json` file. -->
 ```bash
 sudo apt install autoconf autoconf-archive automake build-essential ccache cmake curl fonts-liberation2 git libavcodec-dev libavformat-dev libavutil-dev libgl1-mesa-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-wayland tar unzip zip
 ```