From 9d852ef9fa9a71bed2405cd6746f6d32b876e8b5 Mon Sep 17 00:00:00 2001
From: S Murokh <sashamurokh@gmail.com>
Date: Tue, 24 Feb 2026 16:32:00 -0500
Subject: [PATCH] move environment vars to containerEnv

---
 .devcontainer/devcontainer.json        |  5 ++---
 .devcontainer/macos/devcontainer.json  |  4 ++--
 .devcontainer/nvidia/devcontainer.json | 24 +++++++++++-------------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e8fcb127..96e5b46e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -22,15 +22,14 @@
         }
     },
     "containerEnv": {
-        "DISPLAY": "unix:0",
+        "DISPLAY": "${env:DISPLAY}",
         "ROS_AUTOMATIC_DISCOVERY_RANGE": "SUBNET",
         "ROS_DOMAIN_ID": "42"
     },
     "runArgs": [
         "--net=host",
         "--pid=host",
-        "--ipc=host",
-        "-e", "DISPLAY=${env:DISPLAY}"
+        "--ipc=host"
     ],
     "mounts": [
        
diff --git a/.devcontainer/macos/devcontainer.json b/.devcontainer/macos/devcontainer.json
index 8f742e31..1a8a9c88 100644
--- a/.devcontainer/macos/devcontainer.json
+++ b/.devcontainer/macos/devcontainer.json
@@ -23,12 +23,12 @@
         }
     },
     "containerEnv": {
+        "DISPLAY": "host.docker.internal:0",
         "ROS_AUTOMATIC_DISCOVERY_RANGE": "SUBNET",
         "ROS_DOMAIN_ID": "42"
     },
     "runArgs": [
-        "-p", "5900:5900",
-        "-e", "DISPLAY=host.docker.internal:0"
+        "-p", "5900:5900"
     ],
     "postCreateCommand": ". .devcontainer/setup.sh && sudo rosdep update --rosdistro=jazzy && sudo rosdep install --from-paths lib src --ignore-src -y --rosdistro=jazzy && sudo chown -R $(whoami) /home/ros2_ws/ && (rm -r build/ install/ || true) && colcon build --symlink-install",
     "forwardPorts": [5900]
diff --git a/.devcontainer/nvidia/devcontainer.json b/.devcontainer/nvidia/devcontainer.json
index d8bfa0df..fdc26cbe 100644
--- a/.devcontainer/nvidia/devcontainer.json
+++ b/.devcontainer/nvidia/devcontainer.json
@@ -22,9 +22,17 @@
         }
     },
     "containerEnv": {
-        "DISPLAY": "unix:0",
+        "DISPLAY": "${env:DISPLAY}",
         "ROS_AUTOMATIC_DISCOVERY_RANGE": "SUBNET",
-        "ROS_DOMAIN_ID": "42"
+        "ROS_DOMAIN_ID": "42",
+        "NVIDIA_VISIBLE_DEVICES": "all",
+        "NVIDIA_DRIVER_CAPABILITES": "all",
+        "WAYLAND_DISPLAY": "${env:WAYLAND_DISPLAY}",
+        "LD_LIBRARY_PATH": "/usr/lib/wsl/lib",
+        "MESA_D3D12_DEFAULT_ADAPTER_NAME": "NVIDIA",
+        "MESA_LOADER_DRIVER_OVERRIDE": "d3d12",
+        "GALLIUM_DRIVER": "d3d12",
+        "LIBGL_ALWAYS_INDIRECT": "0"
     },
     "runArgs": [
         "--net=host",
@@ -33,17 +41,7 @@
         "--gpus=all",
         "--runtime=nvidia",
         "--device=/dev/dxg",
-        "--privileged",
-        "-e", "NVIDIA_VISIBLE_DEVICES=all",
-        "-e", "NVIDIA_DRIVER_CAPABILITES=all",
-        "-e", "DISPLAY=${env:DISPLAY}",
-        "-e", "WAYLAND_DISPLAY=${env:WAYLAND_DISPLAY}",
-        "-e", "LD_LIBRARY_PATH=/usr/lib/wsl/lib",
-        "-e", "MESA_D3D12_DEFAULT_ADAPTER_NAME=NVIDIA",
-        "-e", "MESA_LOADER_DRIVER_OVERRIDE=d3d12",
-        "-e", "GALLIUM_DRIVER=d3d12",
-        "-e", "LIBGL_ALWAYS_INDIRECT=0"
-
+        "--privileged"
     ],
     "mounts": [
        "source=/dev/dri,target=/dev/dri,type=bind,consistency=cached",