diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2026-05-17 15:22:39 +0000 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2026-05-17 15:23:34 +0000 |
| commit | 504a0946f5813e65c2e40bcd08c525e65308ca79 (patch) | |
| tree | 58717187b7d93400f16c379ff38501d39c1a351a | |
| parent | 918b270c61383f9f2220e55226d385be49c82326 (diff) | |
| download | kernel-504a0946f5813e65c2e40bcd08c525e65308ca79.tar.xz kernel-504a0946f5813e65c2e40bcd08c525e65308ca79.zip | |
ide: simplify devcontainer setup
| -rw-r--r-- | .devcontainer/x86-64/Containerfile | 31 | ||||
| -rw-r--r-- | .devcontainer/x86-64/devcontainer.json | 10 |
2 files changed, 34 insertions, 7 deletions
diff --git a/.devcontainer/x86-64/Containerfile b/.devcontainer/x86-64/Containerfile new file mode 100644 index 0000000..25f98cd --- /dev/null +++ b/.devcontainer/x86-64/Containerfile @@ -0,0 +1,31 @@ +FROM registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:16.1.0-3-py3.14 + +RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --yes --no-install-recommends \ + acpica-tools \ + clangd-22 \ + clang-tidy-22 \ + cmake \ + g++-16 \ + gcc-16 \ + gdb \ + git \ + git-lfs \ + grub2-common \ + grub-pc \ + mtools \ + ninja-build \ + python3-poetry \ + qemu-system-x86 \ + ssh \ + wget \ + xorriso + +RUN update-alternatives --install /usr/bin/cpp cpp /usr/bin/cpp-16 100 && \ + update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-16 100 && \ + update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-16 100 && \ + update-alternatives --install /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-16 100 && \ + update-alternatives --install /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-16 100 && \ + update-alternatives --install /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-16 100 && \ + update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-16 100 && \ + update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-22 100 && \ + update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-22 100 diff --git a/.devcontainer/x86-64/devcontainer.json b/.devcontainer/x86-64/devcontainer.json index 54bfe08..ebfe64d 100644 --- a/.devcontainer/x86-64/devcontainer.json +++ b/.devcontainer/x86-64/devcontainer.json @@ -1,13 +1,9 @@ { "name": "TeachOS on x86-64", - "image": "registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:16.1.0-3-py3.14", - "features": { - "ghcr.io/devcontainers/features/git:1": {}, - "ghcr.io/devcontainers/features/git-lfs:1": {}, - "ghcr.io/devcontainers-extra/features/apt-packages:1": { - "packages": "acpica-tools,build-essential,clang-tidy-22,clangd-22,cmake,gdb,grub2-common,grub-pc,mtools,ninja-build,python3-poetry,qemu-system-x86,ssh,wget,xorriso" - } + "build": { + "dockerfile": "Containerfile" }, + "remoteUser": "ubuntu", "customizations": { "vscode": { "extensions": [ |