split devcontainer for win and linux

Author: root

.devcontainer/Dockerfile

@@ -39,7 +39,7 @@ ENV NVIDIA_VISIBLE_DEVICES ${NVIDIA_VISIBLE_DEVICES:-all}
 ENV NVIDIA_DRIVER_CAPABILITIES ${NVIDIA_DRIVER_CAPABILITIES:+$NVIDIA_DRIVER_CAPABILITIES,}graphics
 
 # Create and set proper permissions for workspace directory
-RUN mkdir -p /workspace && chown -R $USERNAME:$USERNAME /workspace
+RUN mkdir -p /workspace && chown -R $USERNAME:$USERNAME /workspace && sudo chmod -R 777 /workspace
 
 # Create virtual environment with proper permissions
 ENV VIRTUAL_ENV=/home/vscode/venv
@@ -63,9 +63,4 @@ COPY --chown=$USERNAME:$USERNAME pyproject.toml .
 RUN pip install --no-cache-dir -e ".[test,gpu]"
 
 # Set final working directory and ensure proper permissions
-WORKDIR /workspace
-
-# Add write permissions for workspace and potential mount points
-RUN sudo chmod -R 777 /workspace && \
-    sudo mkdir -p /workspaces && \
-    sudo chown -R $USERNAME:$USERNAME /workspaces
+WORKDIR /workspace

.devcontainer/devcontainer.linux.json

@@ -0,0 +1,58 @@
+{
+    "name": "Crazyflow Development",
+    "build": {
+        "dockerfile": "Dockerfile",
+        "context": ".."
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-python.python",
+                "ms-python.pylance",
+                "charliermarsh.ruff",
+                "ms-vscode.test-adapter-converter",
+                "ms-python.pytest-adapter",
+                "nvidia.nsight-vscode-edition",
+                "ms-azuretools.vscode-docker",
+                "ms-toolsai.jupyter-renderers",
+                "ms-toolsai.jupyter",
+                "ms-toolsai.jupyter-keymap"
+            ],
+            "settings": {
+                "python.defaultInterpreterPath": "/home/vscode/venv/bin/python",
+                "python.testing.pytestEnabled": true, // test framework
+                "python.testing.pytestArgs": [
+                    "-m",
+                    "not render"
+                ],
+                "python.testing.unittestEnabled": false, // test framework
+                "python.testing.nosetestsEnabled": false, // test framework
+                "editor.formatOnSave": true,
+                "editor.codeActionsOnSave": {
+                    "source.fixAll.ruff": true,
+                    "source.organizeImports.ruff": true
+                },
+                "[python]": {
+                    "editor.defaultFormatter": "charliermarsh.ruff",
+                    "editor.formatOnSave": true,
+                    "editor.rulers": [
+                        100
+                    ]
+                }
+            }
+        }
+    },
+    "containerEnv": {
+        "DISPLAY": "${localEnv:DISPLAY}",
+        "XAUTHORITY": "${localEnv:XAUTHORITY}"
+    },
+    "runArgs": [
+        "--gpus=all",
+        "--interactive",
+        "--net=host",
+        "--ipc=host",
+        "--runtime=nvidia"
+    ],
+    "postCreateCommand": "python -m pip install -e '.[test,gpu]'",
+    "remoteUser": "vscode"
+}

.devcontainer/devcontainer.json renamed to .devcontainer/devcontainer.wsl2.json

@@ -42,24 +42,25 @@
             }
         }
     },
-    "mounts": [], // mounts are configured in setup-mounts.sh
-    "postStartCommand": "chmod +x /workspaces/crazyflow/scripts/setup-mounts.sh && /workspaces/crazyflow/scripts/setup-mounts.sh",
-    // set environment variables inside container. localEnv copies from host.
-    "containerEnv": {
+    // mounts required for WSL2 X11
+    "mounts": [
+        "source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind",
+        "source=/mnt/wslg,target=/mnt/wslg,type=bind",
+        "source=/usr/lib/wsl,target=/usr/lib/wsl,type=bind"
+    ],"containerEnv": {
         "DISPLAY": "${localEnv:DISPLAY}",
         "XAUTHORITY": "${localEnv:XAUTHORITY}",
-        "WAYLAND_DISPLAY": "${localEnv:WAYLAND_DISPLAY}", // windows
-        "XDG_RUNTIME_DIR": "${localEnv:XDG_RUNTIME_DIR}", // windows
-        "PULSE_SERVER": "${localEnv:PULSE_SERVER}" // windows
+        "WAYLAND_DISPLAY": "${localEnv:WAYLAND_DISPLAY}", // WSL2
+        "XDG_RUNTIME_DIR": "${localEnv:XDG_RUNTIME_DIR}", // WSL2
+        "PULSE_SERVER": "${localEnv:PULSE_SERVER}" // WSL2
     },
-    // clargs passed to the container
     "runArgs": [
         "--gpus=all",
         "--interactive",
         "--net=host",
         "--ipc=host",
         "--runtime=nvidia"
     ],
-    "postCreateCommand": "pip install -e '.[test,gpu]'", //'.[test,gpu]'
+    "postCreateCommand": "python -m pip install -e '.[test,gpu]'",
     "remoteUser": "vscode"
 }

.gitignore

@@ -10,4 +10,6 @@ saves
 build
 .venv
 !/.devcontainer/devcontainer.json
+!/.devcontainer/devcontainer.linux.json
+!/.devcontainer/devcontainer.wsl2.json
 !/.vscode/launch.json