From 90c3190543b2ac8a7de03ba297f329ee5cc1f513 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 24 Oct 2025 12:14:09 +0000 Subject: ide: switch development container --- .devcontainer/x86-64/devcontainer.json | 39 ++++++++++++++++++++-------------- .gitignore | 14 +++++++----- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/.devcontainer/x86-64/devcontainer.json b/.devcontainer/x86-64/devcontainer.json index 6b76902..f619e3f 100644 --- a/.devcontainer/x86-64/devcontainer.json +++ b/.devcontainer/x86-64/devcontainer.json @@ -1,17 +1,24 @@ { - "name": "TeachOS on x86-64", - "image": "registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.1.0-4", - "customizations": { - "vscode": { - "extensions": [ - "basdp.language-gas-x86", - "llvm-vs-code-extensions.vscode-clangd", - "ms-vscode.cmake-tools", - "webfreak.debug", - "zixuanwang.linkerscript" - ] - } - }, - "remoteUser": "dev", - "updateRemoteUserUID": true -} + "name": "TeachOS on x86-64", + "image": "registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.1.0-5", + "features": { + "ghcr.io/devcontainers/features/git:1": {}, + "ghcr.io/devcontainers/features/git-lfs:1": {}, + "ghcr.io/devcontainers-extra/features/apt-packages:1": { + "packages": "cmake,grub2-common,grub-pc,mtools,ninja-build,qemu-system-x86,xorriso" + } + }, + "customizations": { + "vscode": { + "extensions": [ + "basdp.language-gas-x86", + "llvm-vs-code-extensions.vscode-clangd", + "ms-vscode.cmake-tools", + "webfreak.debug", + "zixuanwang.linkerscript" + ] + } + }, + "remoteUser": "ubuntu", + "updateRemoteUserUID": true +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 13fb722..d575651 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,11 @@ -/.venv +.venv/ +.cache/ + +.gdb_history + +.devpod-internal/ + /build -/.conan/install /docs/_build -/.cache -/.gdb_history -/qemu-stderr-*.log + +qemu-*-*.log -- cgit v1.2.3