From 37bd9773c1938e5f76208bc4e8632fdbbb4190ff Mon Sep 17 00:00:00 2001 From: Hannes Winkler Date: Mon, 15 Jul 2024 15:42:17 +0000 Subject: [PATCH] Use microsoft devcontainer base image --- .devcontainer/Dockerfile | 16 +++++++--------- .devcontainer/devcontainer.json | 2 ++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 1d2c1cd3..6ee1d5bb 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,10 +1,8 @@ -FROM debian:bookworm +FROM mcr.microsoft.com/devcontainers/base:bookworm -RUN env DEBIAN_FRONTEND=noninteractive \ - apt-get update - -RUN env DEBIAN_FRONTEND=noninteractive \ - apt-get install -y \ - gdb git cmake ninja-build pkg-config nano clang clang-format clang-tidy clang-tools \ - libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev fonts-liberation fontconfig libsystemd-dev libinput-dev libudev-dev libxkbcommon-dev libseat-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-plugins-bad gstreamer1.0-libav gstreamer1.0-alsa +RUN env DEBIAN_FRONTEND=noninteractive apt-get update && \ + env DEBIAN_FRONTEND=noninteractive apt-get install -y \ + gdb git cmake ninja-build pkg-config nano clang clang-format clang-tidy clang-tools \ + libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev fonts-liberation fontconfig libsystemd-dev libinput-dev libudev-dev libxkbcommon-dev libseat-dev \ + libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-plugins-bad gstreamer1.0-libav gstreamer1.0-alsa \ + libcurl4-openssl-dev diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f3948308..b2ece15b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,6 +7,7 @@ "build": { "dockerfile": "Dockerfile" }, + // Features to add to the dev container. More info: https://containers.dev/features. "features": { "ghcr.io/devcontainers/features/github-cli:1": {} @@ -18,6 +19,7 @@ "type": "volume" } ], + // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [], // Configure tool-specific properties.