code-server: ros2 initial release

.github/workflows/BuildImage.yml

@@ -4,8 +4,8 @@ on: [push, pull_request, workflow_dispatch]
 
 env:
   ENDPOINT: "linuxserver/mods" #don't modify
-  BASEIMAGE: "replace_baseimage" #replace
-  MODNAME: "replace_modname" #replace
+  BASEIMAGE: "code-server" #replace
+  MODNAME: "ros2" #replace
 
 jobs:
   build:

Dockerfile

@@ -1,6 +1,6 @@
 FROM scratch
 
-LABEL maintainer="username"
+LABEL maintainer="greinet"
 
 # copy local files
 COPY root/ /

README.md

@@ -1,27 +1,9 @@
-# Rsync - Docker mod for openssh-server
+# ROS2 - Docker mod for code-server and openvscode-server
 
-This mod adds rsync to openssh-server, to be installed/updated during container start.
+This mod adds ROS2 to code-server and openvscode-server, to be installed/updated during container start.
 
-In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync`
+In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-ros2`
 
-If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2`
+If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-ros2|linuxserver/mods:code-server-flutter`
 
-# Mod creation instructions
-
-* Fork the repo, create a new branch based on the branch `template`.
-* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done.
-* Inspect the `root` folder contents. Edit, add and remove as necessary.
-* The mod should be compatible with both s6v2 and s6v3 (until s6v2 based baseimages are deprecated).
-* After all init scripts and services are created, run `find ./ -name run -exec chmod +x {} +; find ./ -name finish -exec chmod +x {} +` to fix permissions.
-* Edit this readme with pertinent info, delete these instructions.
-* Finally edit the `.github/workflows/BuildImage.yml`. Customize the build branch, and the vars for `BASEIMAGE` and `MODNAME`.
-* Ask the team to create a new branch named `<baseimagename>-<modname>`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch.
-* Submit PR against the branch created by the team.
-
-
-## Tips and tricks
-
-* To decrease startup times when multiple mods are used, we have consolidated `apt-get update` down to one file. As seen in the [nodejs mod](https://github.com/linuxserver/docker-mods/tree/code-server-nodejs/root/etc/cont-init.d)
-* Some images has helpers built in, these images are currently:
-    * [Openvscode-server](https://github.com/linuxserver/docker-openvscode-server/pull/10/files)
-    * [Code-server](https://github.com/linuxserver/docker-code-server/pull/95)
+The current release [ROS2 Humble](https://docs.ros.org/en/humble/) and its development tools will be made available inside the container.

root/etc/cont-init.d/94-ros2-src

@@ -0,0 +1,12 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** installing ros2 dev environment ****"
+if ! dpkg -l | grep gnupg > /dev/null; then
+    apt-get update && apt-get install -y gnupg
+fi
+
+source /etc/lsb-release
+[[ ! -f "/etc/apt/sources.list.d/ros2.list" ]] && \
+    curl -sL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | apt-key add - && \
+    echo "deb http://packages.ros.org/ros2/ubuntu ${DISTRIB_CODENAME} main" \
+        > /etc/apt/sources.list.d/ros2.list

root/etc/cont-init.d/95-apt-get

@@ -1,5 +1,3 @@
 #!/usr/bin/with-contenv bash
 
-if [ -f /usr/bin/apt ]; then
-    apt-get update
-fi
+apt-get update

root/etc/cont-init.d/98-ros2

@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** Installing ros2 and ros dev tools"
+apt-get install -y \
+    ros-humble-ros-base \
+    ros-dev-tools

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run

@@ -0,0 +1,18 @@
+#!/usr/bin/with-contenv bash
+
+if ! dpkg -l | grep gnupg > /dev/null; then
+    apt-get update && apt-get install -y gnupg
+fi
+
+if [ ! -f "/etc/apt/sources.list.d/ros2.list" ]; then
+    echo "**** Adding ROS2 packages to install list ****"
+    curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
+
+    echo "ros-humble-ros-base ros-dev-tools" >> /mod-repo-packages-to-install.list
+
+    echo "**** Automatically sourcing ROS2 ****"
+    printf "\n# Automatically source ROS2 humble\nsource /opt/ros/humble/setup.bash" >> /etc/bash.bashrc
+else
+    echo "**** ROS2 packages already installed, skipping ****"
+fi

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run