From 461ef53322b4a4aeff970fb26ec595afa2cd7b79 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 8 Feb 2025 17:06:25 +0000 Subject: [PATCH] devcontainer: Clean up and simplify * Remove mounted dirs (the repo is automatically persisted in a volume) * Remove user specific shell env initialization scripts (they're more trouble than they're worth, often break the devcontainer build) * Remove redundant settings already defined in settings.json --- .devcontainer/devcontainer.json | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1a9d66335..79554f5c0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,15 +1,10 @@ { "dockerFile": "Dockerfile", - // Creates local dir to mount to HOME in docker - "initializeCommand": "mkdir -p ${localEnv:HOME}/.bts/devcontainer-mounts/${devcontainerId}", "hostRequirements": { "memory": "4gb", "storage": "6gb" }, - "postCreateCommand": "/home/bts/spark/docker/sparkd/dev/devcontainer_post_create.sh", "containerUser": "bts", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/bts/spark,type=bind", - "workspaceFolder": "/home/bts/spark", "updateRemoteUserUID": true, "shutdownAction": "none", // Note: If running multiple containers on the same host, each must use a @@ -29,16 +24,8 @@ "-p", "12345:12345" ], - "mounts": [ - "source=${localEnv:HOME}/.bts/devcontainer-mounts/${devcontainerId},target=/home/bts,type=bind" - ], "customizations": { "vscode": { - "settings": { - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}/build/clang/debug" - ] - }, "extensions": [ "eamodio.gitlens", "llvm-vs-code-extensions.vscode-clangd", @@ -47,4 +34,4 @@ ] } } -} \ No newline at end of file +}