From adef711ce46f0007c8efad01e0d9b16f11b57ad3 Mon Sep 17 00:00:00 2001 From: Andreas Greiner Date: Wed, 7 Dec 2022 11:48:45 +0100 Subject: [PATCH 1/6] code-server: ros2 initial release Adds ROS2 to code-server and openvscode-server --- .github/workflows/BuildImage.yml | 4 +-- Dockerfile | 2 +- Dockerfile.complex | 23 -------------- README.md | 28 ++++------------- root/etc/cont-init.d/95-apt-get | 5 ---- root/etc/cont-init.d/98-vpn-config | 26 ---------------- .../dependencies.d/init-mods | 0 .../init-mod-code-server-ros2-add-package/run | 18 +++++++++++ .../type | 0 .../init-mod-code-server-ros2-add-package/up | 1 + .../run | 30 ------------------- .../init-mod-imagename-modname-add-package/up | 1 - .../init-mod-imagename-modname-install/run | 8 ----- .../init-mod-imagename-modname-install/type | 1 - .../init-mod-imagename-modname-install/up | 1 - .../init-mod-code-server-ros2-add-package} | 0 .../init-mod-imagename-modname-add-package | 0 .../dependencies.d/init-services | 0 .../s6-rc.d/svc-mod-imagename-modname/run | 7 ----- .../s6-rc.d/svc-mod-imagename-modname/type | 1 - .../init-mod-code-server-ros2-add-package} | 0 .../init-mod-imagename-modname-add-package | 0 .../init-mod-imagename-modname-install | 0 .../user/contents.d/svc-mod-imagename-modname | 0 root/etc/services.d/sshvpn/run | 3 -- 25 files changed, 27 insertions(+), 132 deletions(-) delete mode 100644 Dockerfile.complex delete mode 100644 root/etc/cont-init.d/95-apt-get delete mode 100644 root/etc/cont-init.d/98-vpn-config rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-add-package => init-mod-code-server-ros2-add-package}/dependencies.d/init-mods (100%) create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-add-package => init-mod-code-server-ros2-add-package}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/up delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up rename root/etc/s6-overlay/s6-rc.d/{init-mod-imagename-modname-install/dependencies.d/init-mods-package-install => init-mods-package-install/dependencies.d/init-mod-code-server-ros2-add-package} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-imagename-modname-add-package delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/dependencies.d/init-services delete mode 100755 root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type rename root/etc/s6-overlay/s6-rc.d/{init-mods-end/dependencies.d/init-mod-imagename-modname-install => user/contents.d/init-mod-code-server-ros2-add-package} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-add-package delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-install delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-imagename-modname delete mode 100755 root/etc/services.d/sshvpn/run diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 518b0d8..47a5ee6 100644 --- a/.github/workflows/BuildImage.yml +++ b/.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: diff --git a/Dockerfile b/Dockerfile index 4ece5e8..7703f6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM scratch -LABEL maintainer="username" +LABEL maintainer="greinet" # copy local files COPY root/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index d2c6b11..0000000 --- a/Dockerfile.complex +++ /dev/null @@ -1,23 +0,0 @@ -## Buildstage ## -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage - -RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl && \ - echo "**** grab rclone ****" && \ - mkdir -p /root-layer && \ - curl -o \ - /root-layer/rclone.deb -L \ - "https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb" - -# copy local files -COPY root/ /root-layer/ - -## Single layer deployed image ## -FROM scratch - -LABEL maintainer="username" - -# Add files from buildstage -COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index e2c84a5..ae3a3dd 100644 --- a/README.md +++ b/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 `-`. 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. \ No newline at end of file diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get deleted file mode 100644 index 8e5fe66..0000000 --- a/root/etc/cont-init.d/95-apt-get +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [ -f /usr/bin/apt ]; then - apt-get update -fi diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config deleted file mode 100644 index 98f2770..0000000 --- a/root/etc/cont-init.d/98-vpn-config +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/with-contenv bash - -# Determine if setup is needed -if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \ -[ -f /usr/bin/apt ]; then - ## Ubuntu - apt-get install --no-install-recommends -y \ - iptables \ - openssh-client \ - python3 \ - python3-pip - pip3 install sshuttle -fi -if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \ -[ -f /sbin/apk ]; then - # Alpine - apk add --no-cache \ - iptables \ - openssh \ - py3-pip \ - python3 - pip3 install sshuttle -fi - -chown -R root:root /root -chmod -R 600 /root/.ssh diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/dependencies.d/init-mods similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/dependencies.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/dependencies.d/init-mods diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run new file mode 100755 index 0000000..2d82736 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/type rename to root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/up new file mode 100644 index 0000000..ec17dbd --- /dev/null +++ b/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 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run deleted file mode 100755 index 063b570..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/with-contenv bash - -# This is the init file used for adding os or pip packages to install lists. -# It takes advantage of the built-in init-mods-package-install init script that comes with the baseimages. -# If using this, we need to make sure we set this init as a dependency of init-mods-package-install so this one runs first - -if ! command -v apprise; then - echo "**** Adding apprise and its deps to package install lists ****" - echo "apprise" >> /mod-pip-packages-to-install.list - ## Ubuntu - if [ -f /usr/bin/apt ]; then - echo "\ - python3 \ - python3-pip \ - runc" >> /mod-repo-packages-to-install.list - fi - # Alpine - if [ -f /sbin/apk ]; then - echo "\ - cargo \ - libffi-dev \ - openssl-dev \ - python3 \ - python3-dev \ - python3 \ - py3-pip" >> /mod-repo-packages-to-install.list - fi -else - echo "**** apprise already installed, skipping ****" -fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up deleted file mode 100644 index 6414139..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run deleted file mode 100755 index 59a4b77..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/with-contenv bash - -# This is an install script that is designed to run after init-mods-package-install -# so it can take advantage of packages installed -# init-mods-end depends on this script so that later init and services wait until this script exits - -echo "**** Setting up apprise ****" -apprise blah blah diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type deleted file mode 100644 index 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up b/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up deleted file mode 100644 index 03d298d..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-ros2-add-package similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/dependencies.d/init-mods-package-install rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-ros2-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-imagename-modname-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-imagename-modname-add-package deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/dependencies.d/init-services deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run deleted file mode 100755 index 02ffe39..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/run +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/with-contenv bash - -# This is an example service that would run for the mod -# It depends on init-services, the baseimage hook for start of all longrun services - -exec \ - s6-setuidgid abc run my app diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type b/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type deleted file mode 100644 index 1780f9f..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-imagename-modname/type +++ /dev/null @@ -1 +0,0 @@ -longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-imagename-modname-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-ros2-add-package similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-imagename-modname-install rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-ros2-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-add-package deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-imagename-modname-install deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-imagename-modname b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-imagename-modname deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/services.d/sshvpn/run b/root/etc/services.d/sshvpn/run deleted file mode 100755 index 7d49e79..0000000 --- a/root/etc/services.d/sshvpn/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash - -sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16 From 0d7ffd1bf4fc1ca0a6fb3f988bd811844b32de62 Mon Sep 17 00:00:00 2001 From: Andreas Greiner Date: Wed, 14 Dec 2022 14:15:22 +0100 Subject: [PATCH 2/6] added s6v2 files --- root/etc/cont-init.d/95-apt-get | 3 +++ root/etc/cont-init.d/98-ros2 | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100755 root/etc/cont-init.d/95-apt-get create mode 100755 root/etc/cont-init.d/98-ros2 diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get new file mode 100755 index 0000000..3a725ea --- /dev/null +++ b/root/etc/cont-init.d/95-apt-get @@ -0,0 +1,3 @@ +#!/usr/bin/with-contenv bash + +apt-get update \ No newline at end of file diff --git a/root/etc/cont-init.d/98-ros2 b/root/etc/cont-init.d/98-ros2 new file mode 100755 index 0000000..5a48170 --- /dev/null +++ b/root/etc/cont-init.d/98-ros2 @@ -0,0 +1,19 @@ +!/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 \ No newline at end of file From cce914b69afd868291fe32ab5b2eec7458ad5790 Mon Sep 17 00:00:00 2001 From: Andreas Greiner Date: Thu, 15 Dec 2022 09:51:54 +0100 Subject: [PATCH 3/6] moved repo addition to 94-ros2-src --- root/etc/cont-init.d/94-ros2-src | 12 ++++++++++++ root/etc/cont-init.d/95-apt-get | 2 +- root/etc/cont-init.d/98-ros2 | 23 +++++------------------ 3 files changed, 18 insertions(+), 19 deletions(-) create mode 100755 root/etc/cont-init.d/94-ros2-src diff --git a/root/etc/cont-init.d/94-ros2-src b/root/etc/cont-init.d/94-ros2-src new file mode 100755 index 0000000..720dbba --- /dev/null +++ b/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 diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get index 3a725ea..5b1a21c 100755 --- a/root/etc/cont-init.d/95-apt-get +++ b/root/etc/cont-init.d/95-apt-get @@ -1,3 +1,3 @@ #!/usr/bin/with-contenv bash -apt-get update \ No newline at end of file +apt-get update diff --git a/root/etc/cont-init.d/98-ros2 b/root/etc/cont-init.d/98-ros2 index 5a48170..27b6587 100755 --- a/root/etc/cont-init.d/98-ros2 +++ b/root/etc/cont-init.d/98-ros2 @@ -1,19 +1,6 @@ -!/usr/bin/with-contenv bash +#!/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 \ No newline at end of file +echo "**** Installing ros2 and ros dev tools" +apt-get install -y \ + ros-humble-ros-base \ + ros-dev-tools From f5947587cc5ea0eb34ed3335bc9025ffa642907c Mon Sep 17 00:00:00 2001 From: Andreas Greiner Date: Thu, 15 Dec 2022 09:53:31 +0100 Subject: [PATCH 4/6] code cleanup --- root/etc/cont-init.d/98-ros2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/98-ros2 b/root/etc/cont-init.d/98-ros2 index 27b6587..3e2b01a 100755 --- a/root/etc/cont-init.d/98-ros2 +++ b/root/etc/cont-init.d/98-ros2 @@ -3,4 +3,4 @@ echo "**** Installing ros2 and ros dev tools" apt-get install -y \ ros-humble-ros-base \ - ros-dev-tools + ros-dev-tools From 6d34bc97d797d740a8e05120eff4bf3c76dd5c4f Mon Sep 17 00:00:00 2001 From: Andreas Greiner Date: Tue, 3 Jan 2023 09:08:17 +0100 Subject: [PATCH 5/6] Moved ROS2 sourcing to home dir and fixed 94-ros2-src --- root/etc/cont-init.d/94-ros2-src | 3 ++- root/etc/cont-init.d/98-ros2 | 3 +++ .../s6-rc.d/init-mod-code-server-ros2-add-package/run | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/94-ros2-src b/root/etc/cont-init.d/94-ros2-src index 720dbba..f91299b 100755 --- a/root/etc/cont-init.d/94-ros2-src +++ b/root/etc/cont-init.d/94-ros2-src @@ -6,7 +6,8 @@ if ! dpkg -l | grep gnupg > /dev/null; then fi source /etc/lsb-release -[[ ! -f "/etc/apt/sources.list.d/ros2.list" ]] && \ +if [ ! -f "/etc/apt/sources.list.d/ros2.list" ]; then 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 +fi diff --git a/root/etc/cont-init.d/98-ros2 b/root/etc/cont-init.d/98-ros2 index 3e2b01a..cc07d7b 100755 --- a/root/etc/cont-init.d/98-ros2 +++ b/root/etc/cont-init.d/98-ros2 @@ -4,3 +4,6 @@ echo "**** Installing ros2 and ros dev tools" apt-get install -y \ ros-humble-ros-base \ ros-dev-tools + +echo "**** Automatically sourcing ROS2 ****" + printf "\n# Automatically source ROS2 humble\nsource /opt/ros/humble/setup.bash" >> /config/.bashrc \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run index 2d82736..761af83 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run @@ -12,7 +12,7 @@ if [ ! -f "/etc/apt/sources.list.d/ros2.list" ]; then 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 + printf "\n# Automatically source ROS2 humble\nsource /opt/ros/humble/setup.bash" >> /config/.bashrc else echo "**** ROS2 packages already installed, skipping ****" fi \ No newline at end of file From eeeb5ee947d5a519f527cd56dd5a889a4c1cfb1d Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Thu, 13 Apr 2023 14:39:59 -0400 Subject: [PATCH 6/6] add/update workflows, drop s6v2 --- .github/workflows/BuildImage.yml | 81 ++++++++----------- .github/workflows/call_issue_pr_tracker.yml | 14 ++++ .github/workflows/permissions.yml | 10 +++ root/etc/cont-init.d/94-ros2-src | 13 --- root/etc/cont-init.d/95-apt-get | 3 - root/etc/cont-init.d/98-ros2 | 9 --- .../init-mod-code-server-ros2-add-package/run | 6 +- 7 files changed, 60 insertions(+), 76 deletions(-) create mode 100644 .github/workflows/call_issue_pr_tracker.yml create mode 100644 .github/workflows/permissions.yml delete mode 100755 root/etc/cont-init.d/94-ros2-src delete mode 100755 root/etc/cont-init.d/95-apt-get delete mode 100755 root/etc/cont-init.d/98-ros2 diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 47a5ee6..a9fbd9c 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -1,62 +1,45 @@ name: Build Image -on: [push, pull_request, workflow_dispatch] +on: [push, pull_request_target, workflow_dispatch] env: + GITHUB_REPO: "linuxserver/docker-mods" #don't modify ENDPOINT: "linuxserver/mods" #don't modify BASEIMAGE: "code-server" #replace MODNAME: "ros2" #replace jobs: - build: + set-vars: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 - - - name: Build image + - name: Set Vars + id: outputs run: | - docker build --no-cache -t ${{ github.sha }} . + echo "GITHUB_REPO=${{ env.GITHUB_REPO }}" >> $GITHUB_OUTPUT + echo "ENDPOINT=${{ env.ENDPOINT }}" >> $GITHUB_OUTPUT + echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT + echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT + # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. **** + MOD_VERSION="" + echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT + outputs: + GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }} + ENDPOINT: ${{ steps.outputs.outputs.ENDPOINT }} + BASEIMAGE: ${{ steps.outputs.outputs.BASEIMAGE }} + MODNAME: ${{ steps.outputs.outputs.MODNAME }} + MOD_VERSION: ${{ steps.outputs.outputs.MOD_VERSION }} - - name: Tag image - if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }} - run: | - docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME} - docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} - - - name: Credential check - if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }} - run: | - echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV - echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV - echo "DOCKERUSER=${{ secrets.DOCKERUSER }}" >> $GITHUB_ENV - echo "DOCKERPASS=${{ secrets.DOCKERPASS }}" >> $GITHUB_ENV - if [[ "${{ secrets.CR_USER }}" == "" && "${{ secrets.CR_PAT }}" == "" && "${{ secrets.DOCKERUSER }}" == "" && "${{ secrets.DOCKERPASS }}" == "" ]]; then - echo "::error::Push credential secrets missing." - echo "::error::You must set either CR_USER & CR_PAT or DOCKERUSER & DOCKERPASS as secrets in your repo settings." - echo "::error::See https://github.com/linuxserver/docker-mods/blob/master/README.md for more information/instructions." - exit 1 - fi - - - name: Login to GitHub Container Registry - if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }} - run: | - echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin - - - name: Push tags to GitHub Container Registry - if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }} - run: | - docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} - docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME} - - - name: Login to DockerHub - if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }} - run: | - echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin - - - name: Push tags to DockerHub - if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }} - run: | - docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} - docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME} + build: + uses: linuxserver/github-workflows/.github/workflows/docker-mod-builder.yml@v1 + needs: set-vars + secrets: + CR_USER: ${{ secrets.CR_USER }} + CR_PAT: ${{ secrets.CR_PAT }} + DOCKERUSER: ${{ secrets.DOCKERUSER }} + DOCKERPASS: ${{ secrets.DOCKERPASS }} + with: + GITHUB_REPO: ${{ needs.set-vars.outputs.GITHUB_REPO }} + ENDPOINT: ${{ needs.set-vars.outputs.ENDPOINT }} + BASEIMAGE: ${{ needs.set-vars.outputs.BASEIMAGE }} + MODNAME: ${{ needs.set-vars.outputs.MODNAME }} + MOD_VERSION: ${{ needs.set-vars.outputs.MOD_VERSION }} diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml new file mode 100644 index 0000000..87243e2 --- /dev/null +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -0,0 +1,14 @@ +name: Issue & PR Tracker + +on: + issues: + types: [opened,reopened,labeled,unlabeled] + pull_request_target: + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + +jobs: + manage-project: + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1 + secrets: inherit diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml new file mode 100644 index 0000000..1447bc5 --- /dev/null +++ b/.github/workflows/permissions.yml @@ -0,0 +1,10 @@ +name: Permission check +on: + pull_request_target: + paths: + - '**/run' + - '**/finish' + - '**/check' +jobs: + permission_check: + uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 diff --git a/root/etc/cont-init.d/94-ros2-src b/root/etc/cont-init.d/94-ros2-src deleted file mode 100755 index f91299b..0000000 --- a/root/etc/cont-init.d/94-ros2-src +++ /dev/null @@ -1,13 +0,0 @@ -#!/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 -if [ ! -f "/etc/apt/sources.list.d/ros2.list" ]; then - 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 -fi diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get deleted file mode 100755 index 5b1a21c..0000000 --- a/root/etc/cont-init.d/95-apt-get +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash - -apt-get update diff --git a/root/etc/cont-init.d/98-ros2 b/root/etc/cont-init.d/98-ros2 deleted file mode 100755 index cc07d7b..0000000 --- a/root/etc/cont-init.d/98-ros2 +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/with-contenv bash - -echo "**** Installing ros2 and ros dev tools" -apt-get install -y \ - ros-humble-ros-base \ - ros-dev-tools - -echo "**** Automatically sourcing ROS2 ****" - printf "\n# Automatically source ROS2 humble\nsource /opt/ros/humble/setup.bash" >> /config/.bashrc \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run index 761af83..696c0eb 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-ros2-add-package/run @@ -11,8 +11,10 @@ if [ ! -f "/etc/apt/sources.list.d/ros2.list" ]; then 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" >> /config/.bashrc + if ! grep -q '/opt/ros/humble/setup.bash' /config/.bashrc; then + echo "**** Automatically sourcing ROS2 ****" + printf "\n# Automatically source ROS2 humble\nsource /opt/ros/humble/setup.bash" >> /config/.bashrc + fi else echo "**** ROS2 packages already installed, skipping ****" fi \ No newline at end of file