Update devcontainer

.devcontainer/Dockerfile

@@ -1,13 +1,13 @@
 FROM ros:iron
-ARG USERNAME=openmower
+ARG USERNAME=dev
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
 RUN groupadd --gid $USER_GID $USERNAME \
     && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
     && yes $USERNAME | passwd $USERNAME \
     && usermod --shell /bin/bash $USERNAME \
-    && usermod -aG dialout openmower
+    && usermod -aG dialout $USERNAME
 
 RUN apt-get update \
   && apt-get install -y ssh \
@@ -22,29 +22,5 @@ RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
 
 ENV SHELL /bin/bash
 
-RUN mkdir -p /home/ws/build /home/ws/install /home/ws/log \
-  && chown -R $USERNAME:$USERNAME /home/ws
-
-RUN ( \
-    echo "source /opt/ros/iron/setup.bash"; \
-    echo "source /home/ws/install/setup.bash"; \
-    echo "source /home/ws/.devcontainer/openmower_config.env"; \
-    echo "export DISPLAY=:0"; \
-  ) >> /home/$USERNAME/.bashrc
-
-RUN ( \
-    echo "PasswordAuthentication yes"; \
-    echo "PermitRootLogin yes"; \
-) >> /etc/ssh/sshd_config
-
-RUN sed -i 's/#Port 22/Port 2222/' /etc/ssh/sshd_config
-RUN mkdir /run/sshd
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
 USER $USERNAME
-
-ENTRYPOINT ["/entrypoint.sh"]
-
-CMD ["/usr/bin/sudo", "/usr/sbin/sshd", "-D", "-e", "-f", "/etc/ssh/sshd_config"]
+CMD ["/bin/bash"]

.devcontainer/devcontainer.json

@@ -1,23 +1,39 @@
 {
-    "name": "OpenMowerNext development environment",
-    "privileged": true,
-    "remoteUser": "openmower",
-    "dockerComposeFile": "docker-compose.yaml",
-    "service": "workspace",
-    "workspaceFolder": "/home/ws",
-    "customizations": {
-        "vscode": {
-            "extensions":[
-				"ms-vscode.cpptools",
-				"ms-vscode.cpptools-themes",
-				"twxs.cmake",
-				"donjayamanne.python-extension-pack",
-				"eamodio.gitlens",
-				"ms-iot.vscode-ros",
-				"ms-vscode.makefile-tools",
-				"DotJoshJohnson.xml"
-			]
-        }
-    },
-    "containerUser": "openmower"
+  "name": "OpenMowerNext development environment",
+  "privileged": true,
+  "remoteUser": "dev",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "cacheFrom": "ghcr.io/jkaflik/openmowerros2-devcontainer:main",
+    "args": {
+      "USERNAME": "dev"
+    }
+  },
+  "containerUser": "dev",
+  "workspaceFolder": "/opt/ws",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/opt/ws,type=bind",
+  "containerEnv": {
+    "DISPLAY": ":0",
+    "ROS_LOCALHOST_ONLY": "1",
+    "ROS_DOMAIN_ID": "42"
+  },
+  "runArgs": [
+    "--net=host",
+    "-e", "DISPLAY=${env:DISPLAY}"
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-vscode.cpptools",
+        "ms-vscode.cpptools-themes",
+        "twxs.cmake",
+        "donjayamanne.python-extension-pack",
+        "eamodio.gitlens",
+        "ms-iot.vscode-ros",
+        "ms-vscode.makefile-tools",
+        "DotJoshJohnson.xml"
+      ]
+    }
+  },
+  "postCreateCommand": "sudo apt update && rosdep update && make custom-deps deps && sudo chown -R $(whoami) /opt/ws/"
 }