Support noetic (#12)

* Disable shadows

* Add gazebo_ros_pkgs dependency

* Update comments about kinect model

* Modified dockerfile

* Update CI to build noetic image

* Update CI to test on noetic environment

* Update README

* Fix typo

Author: ShotaAk

Diff for: .docker/Dockerfile

@@ -11,7 +11,7 @@ COPY . pcl_tutorials_ros
 # The add-apt-repository command needs software-properties-common package.
 # https://github.com/IntelRealSense/librealsense/blob/c94410a420b74e5fb6a414bd12215c05ddd82b69/doc/distribution_linux.md
 RUN apt-get update && \
-    apt-get install -y software-properties-common && \
+    apt-get install -y software-properties-common git && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE && \
     add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo $(lsb_release -cs) main" -u && \

Diff for: .docker/README.md

@@ -56,9 +56,9 @@ rocker --x11 --net=host --privileged \
 
 ```sh
 $ cd pcl_tutorials_ros/.docker
-$ ./build.sh melodic
+$ ./build.sh noetic
 ...
-Successfully tagged pcl_tutorials_ros:melodic
+Successfully tagged pcl_tutorials_ros:noetic
 ```
 
 ## References

Diff for: .github/workflows/build_docker_image.yaml

@@ -9,10 +9,15 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  ROS_DISTRO: melodic
 
 jobs:
   build-and-push-image:
+    strategy:
+      matrix:
+        env:
+          - { ROS_DISTRO: melodic}
+          - { ROS_DISTRO: noetic}
+
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -35,13 +40,13 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=${{ env.ROS_DISTRO }}
+            type=raw,value=${{ matrix.env.ROS_DISTRO }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with:
           file: .docker/Dockerfile
-          build-args: ROS_DISTRO=${{ env.ROS_DISTRO }}
+          build-args: ROS_DISTRO=${{ matrix.env.ROS_DISTRO }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Diff for: .github/workflows/industrial_ci.yaml

@@ -19,6 +19,7 @@ jobs:
       matrix:
         env:
           - { ROS_DISTRO: melodic, ROS_REPO: main}
+          - { ROS_DISTRO: noetic, ROS_REPO: main}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

Diff for: README.md

@@ -10,6 +10,7 @@ on ROS environments.
 ## Requirments
 
 - ROS Melodic
+- ROS Noetic
 
 ### Optional
 
@@ -22,7 +23,7 @@ on ROS environments.
 Please refer to [.docker/README.md](.docker/README.md) for details.
 
 ```sh
-docker pull ghcr.io/shotaak/pcl_tutorials_ros:melodic
+docker pull ghcr.io/shotaak/pcl_tutorials_ros:noetic
 ```
 
 ## Source build
@@ -77,4 +78,7 @@ roslaunch pcl_tutorials_ros example.launch use_file:=true file:=pcl_logo.pcd
 
 ## License
 
-MIT License
+This package is released under the MIT License.
+
+The original source code of [kinect_ros](./models/kinect_ros/) is 
+[osrf/gazebo_models (Creative Commons Attribution 3.0 Unported License)](https://github.com/osrf/gazebo_models).

Diff for: models/kinect_ros/model.sdf

@@ -38,7 +38,7 @@
           </clip>
         </camera>
 
-        <!-- Ref: http://gazebosim.org/tutorials/?tut=ros_depth_camera -->
+        <!-- Ref: https://classic.gazebosim.org/tutorials?tut=ros_depth_camera&cat=connect_ros -->
         <plugin name="camera_plugin" filename="libgazebo_ros_openni_kinect.so">
           <baseline>0.2</baseline>
           <alwaysOn>true</alwaysOn>

Diff for: package.xml

@@ -11,7 +11,7 @@
   <buildtool_depend>catkin</buildtool_depend>
 
   <depend>gazebo</depend>
-  <depend>gazebo_ros</depend>
+  <depend>gazebo_ros_pkgs</depend>
   <depend>pcl_conversions</depend>
   <depend>pcl_ros</depend>
   <depend>realsense2_camera</depend>

Diff for: worlds/table.world

@@ -1,6 +1,10 @@
 <?xml version="1.0" ?>
 <sdf version="1.6">
   <world name="TableWorld">
+    <scene>
+      <shadows>0</shadows>
+    </scene>
+
     <include>
       <uri>model://sun</uri>
     </include>