summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.devcontainer/.bashrc4
-rw-r--r--.devcontainer/devcontainer.json3
2 files changed, 4 insertions, 3 deletions
diff --git a/.devcontainer/.bashrc b/.devcontainer/.bashrc
index 6a6ea69..855ea75 100644
--- a/.devcontainer/.bashrc
+++ b/.devcontainer/.bashrc
@@ -1,6 +1,6 @@
export LS_OPTIONS='-F --color=auto'
eval "`dircolors`"
alias ls='ls $LS_OPTIONS'
-if [ -f /workspaces/zmk/zephyr/zephyr-env.sh ]; then
- source /workspaces/zmk/zephyr/zephyr-env.sh
+if [ -f "$WORKSPACE_DIR/zephyr/zephyr-env.sh" ]; then
+ source "$WORKSPACE_DIR/zephyr/zephyr-env.sh"
fi
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f21465d..940b78b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,6 +2,7 @@
"name": "ZMK Development",
"dockerFile": "Dockerfile",
"extensions": ["ms-vscode.cpptools"],
- "runArgs": ["--security-opt", "label=disable"]
+ "runArgs": ["--security-opt", "label=disable"],
+ "containerEnv": {"WORKSPACE_DIR": "${containerWorkspaceFolder}"}
}