Updated devcontainer configurations to use latest changes

Robotic-Decision-Making-Lab · Oct 12, 2023 · b435bf3 · b435bf3
1 parent 5c662c2
commit b435bf3
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 38 deletions.
diff --git a/.devcontainer/nouveau/Dockerfile b/.devcontainer/nouveau/Dockerfile
@@ -0,0 +1,27 @@
+FROM ghcr.io/robotic-decision-making-lab/blue:rolling-desktop
+
+# Install ROS dependencies
+# This is done in a previous stage, but we include it again here in case anyone wants to
+# add new dependencies during development
+ENV USERNAME=blue
+ENV USER_WORKSPACE=/home/$USERNAME/ws_blue
+WORKDIR $USER_WORKSPACE
+
+COPY --chown=$USER_UID:$USER_GID . src/blue
+RUN sudo apt-get -q update \
+    && sudo apt-get -q -y upgrade \
+    && rosdep update \
+    && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --skip-keys="gz-transport12 gz-sim7 gz-math7 gz-msgs9 gz-plugin2" \
+    && sudo apt-get autoremove -y \
+    && sudo apt-get clean -y \
+    && sudo rm -rf /var/lib/apt/lists/*
+
+# Install debugging/linting Python packages
+COPY --chown=$USER_UID:$USER_GID requirements-dev.txt .
+RUN python3 -m pip install -r requirements-dev.txt \
+    && rm -rf requirements-dev.txt
+
+# Disable the setuputils installation warning
+# This prevents us from needing to pin the setuputils version (which doesn't always work)
+ENV PYTHONWARNINGS="ignore"
+
diff --git a/.devcontainer/nouveau/devcontainer.json b/.devcontainer/nouveau/devcontainer.json
@@ -1,13 +1,9 @@
 {
-  "dockerFile": "../../.docker/Dockerfile",
+  "name": "Blue Nouveau Dev Container",
+  "dockerFile": "Dockerfile",
   "context": "../..",
-  "build": {
-    "args": {
-      "WORKSPACE": "${containerWorkspaceFolder}",
-      "ROS_DISTRO": "rolling"
-    },
-    "target": "develop"
-  },
+  "workspaceMount": "source=${localWorkspaceFolder},target=/home/blue/ws_blue/src/blue,type=bind",
+  "workspaceFolder": "/home/blue/ws_blue/src/blue",
   "remoteUser": "blue",
   "runArgs": [
     "--network=host",
@@ -43,12 +39,6 @@
         "editor.tabSize": 2,
         "xml.format.maxLineWidth": 100,
         "json.format.enable": true,
-        "python.linting.enabled": true,
-        "python.linting.flake8Enabled": true,
-        "python.linting.pylintEnabled": false,
-        "python.linting.pydocstyleEnabled": true,
-        "python.linting.mypyEnabled": true,
-        "python.formatting.provider": "black",
         "autoDocstring.startOnNewLine": false,
         "autoDocstring.docstringFormat": "google-notypes",
         "isort.args": ["--profile", "black"],
@@ -78,7 +68,8 @@
           "editor.rulers": [90],
           "editor.codeActionsOnSave": {
             "source.organizeImports": true
-          }
+          },
+          "editor.defaultFormatter": "ms-python.black-formatter"
         },
         "[dockerfile]": {
           "editor.quickSuggestions": {

diff --git a/.devcontainer/nvidia/Dockerfile b/.devcontainer/nvidia/Dockerfile
@@ -0,0 +1,26 @@
+FROM ghcr.io/robotic-decision-making-lab/blue:rolling-desktop-nvidia
+
+# Install ROS dependencies
+# This is done in a previous stage, but we include it again here in case anyone wants to
+# add new dependencies during development
+ENV USERNAME=blue
+ENV USER_WORKSPACE=/home/$USERNAME/ws_blue
+WORKDIR $USER_WORKSPACE
+
+COPY --chown=$USER_UID:$USER_GID . src/blue
+RUN sudo apt-get -q update \
+    && sudo apt-get -q -y upgrade \
+    && rosdep update \
+    && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --skip-keys="gz-transport12 gz-sim7 gz-math7 gz-msgs9 gz-plugin2" \
+    && sudo apt-get autoremove -y \
+    && sudo apt-get clean -y \
+    && sudo rm -rf /var/lib/apt/lists/*
+
+# Install debugging/linting Python packages
+COPY --chown=$USER_UID:$USER_GID requirements-dev.txt .
+RUN python3 -m pip install -r requirements-dev.txt \
+    && rm -rf requirements-dev.txt
+
+# Disable the setuputils installation warning
+# This prevents us from needing to pin the setuputils version (which doesn't always work)
+ENV PYTHONWARNINGS="ignore"
diff --git a/.devcontainer/nvidia/devcontainer.json b/.devcontainer/nvidia/devcontainer.json
@@ -1,13 +1,9 @@
 {
-  "dockerFile": "../../.docker/Dockerfile",
+  "name": "Blue NVIDIA Dev Container",
+  "dockerFile": "Dockerfile",
   "context": "../..",
-  "build": {
-    "args": {
-      "WORKSPACE": "${containerWorkspaceFolder}",
-      "ROS_DISTRO": "rolling"
-    },
-    "target": "desktop-nvidia"
-  },
+  "workspaceMount": "source=${localWorkspaceFolder},target=/home/blue/ws_blue/src/blue,type=bind",
+  "workspaceFolder": "/home/blue/ws_blue/src/blue",
   "remoteUser": "blue",
   "runArgs": [
     "--network=host",
@@ -47,12 +43,6 @@
         "editor.tabSize": 2,
         "xml.format.maxLineWidth": 100,
         "json.format.enable": true,
-        "python.linting.enabled": true,
-        "python.linting.flake8Enabled": true,
-        "python.linting.pylintEnabled": false,
-        "python.linting.pydocstyleEnabled": true,
-        "python.linting.mypyEnabled": true,
-        "python.formatting.provider": "black",
         "autoDocstring.startOnNewLine": false,
         "autoDocstring.docstringFormat": "google-notypes",
         "isort.args": ["--profile", "black"],
@@ -82,7 +72,8 @@
           "editor.rulers": [90],
           "editor.codeActionsOnSave": {
             "source.organizeImports": true
-          }
+          },
+          "editor.defaultFormatter": "ms-python.black-formatter"
         },
         "[dockerfile]": {
           "editor.quickSuggestions": {

diff --git a/.docker/compose/nouveau-compose.yaml b/.docker/compose/nouveau-compose.yaml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   blue:
-    image: blue
+    image: ghcr.io/robotic-decision-making-lab/blue:rolling-desktop
     environment:
       - DISPLAY=${DISPLAY}
       - XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR}
@@ -17,6 +17,4 @@ services:
     volumes:
       - /dev:/dev
       - /run/user/1000:/run/user/1000
-    command: /bin/bash
-    stdin_open: true
-    tty: true
+    command: tail -f /dev/null
diff --git a/.docker/compose/nvidia-compose.yaml b/.docker/compose/nvidia-compose.yaml
@@ -1,14 +1,14 @@
 version: "3"
 services:
   blue:
-    image: blue
+    image: ghcr.io/robotic-decision-making-lab/blue:rolling-desktop-nvidia
     environment:
       - DISPLAY=${DISPLAY}
       - XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR}
       - LIBGL_ALWAYS_SOFTWARE=1
       - QT_X11_NO_MITSHM=1
-      # - WAYLAND_DISPLAY=${WAYLAND_DISPLAY} # Can be commented out if not used
-      # - PULSE_SERVER=${PULSE_SERVER} # Can be commented out if not used
+      - WAYLAND_DISPLAY=${WAYLAND_DISPLAY} # Can be commented out if not used
+      - PULSE_SERVER=${PULSE_SERVER} # Can be commented out if not used
     network_mode: host
     privileged: true
     cap_add:

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -6,7 +6,6 @@ on:
   push:
     branches:
       - main
-      - 120-feature-cleanup-dockerfile
   pull_request:
     paths:
       - .docker/**