From 6a6ad098d09db49c9a3e29bcfab2eebc75ba1a44 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Wed, 17 May 2023 14:19:05 -0400
Subject: [PATCH] code-server-ros2 update/add workflows

---
 .github/workflows/call_issue_pr_tracker.yml                 | 6 ++++--
 Dockerfile                                                  | 2 ++
 .../s6-rc.d/init-mod-code-server-ros2-add-package/run       | 6 +-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml
index 87243e2..2c30784 100644
--- a/.github/workflows/call_issue_pr_tracker.yml
+++ b/.github/workflows/call_issue_pr_tracker.yml
@@ -2,9 +2,11 @@ name: Issue & PR Tracker
 
 on:
   issues:
-    types: [opened,reopened,labeled,unlabeled]
+    types: [opened,reopened,labeled,unlabeled,closed]
   pull_request_target:
-    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+  pull_request_review:
+    types: [submitted,edited,dismissed]
 
 jobs:
   manage-project:
diff --git a/Dockerfile b/Dockerfile
index 7703f6b..42d833a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM scratch
 
 LABEL maintainer="greinet"
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 696c0eb..a551f85 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
@@ -1,13 +1,9 @@
 #!/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 "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" | tee /etc/apt/sources.list.d/ros2.list > /dev/null
 
     echo "ros-humble-ros-base ros-dev-tools" >> /mod-repo-packages-to-install.list