Merge branch 'hotfix/documentation_fw_1_4_x' into 'master'

Fix compatibility matrix on README

Closes #59

See merge request syntron/support/csr/ifm3d/ifm3d-ros!47

README.md

@@ -9,14 +9,13 @@
 :::{warning} Note that the `master` branch is generally in a work in progress, and you probably want to use a tagged [release version](https://github.com/ifm/ifm3d-ros/releases) for production.
 :::
 
-| **ifm3d-ros version** | **ifm3d version** | **embedded O3R FW version** | **ROS distribution(s)** |
-| --------------------- | ----------------- | --------------------------- | ----------------------- |
-| 1.1.2                 | 1.3.3, 1.4.3, 1.5.3| 1.0.14, 1.1.30, 1.1.41, 1.4.30      | ROS Noetic              |
-| 1.1.1                 | 1.2.6             | 1.0.14                      | ROS Noetic              |
-| 1.1.0 (unreleased)    | 1.2.3             | 1.0.x                       | ROS Noetic              |
-| 1.0.1                 | 0.93.0            | 0.14.23                     | ROS Noetic              |
-| 1.0.0                 | 0.91.0            | 0.14.23                     | ROS Noetic              |
-
+| **ifm3d-ros version** | **ifm3d version**   | **embedded O3R FW version**    | **ROS distribution(s)** |
+| --------------------- | ------------------- | ------------------------------ | ----------------------- |
+| 1.1.2                 | 1.3.3, 1.4.3, 1.5.3 | 1.0.14, 1.1.30, 1.1.41, 1.4.30 | ROS Noetic              |
+| 1.1.1                 | 1.2.6               | 1.0.14                         | ROS Noetic              |
+| 1.1.0 (unreleased)    | 1.2.3               | 1.0.x                          | ROS Noetic              |
+| 1.0.1                 | 0.93.0              | 0.14.23                        | ROS Noetic              |
+| 1.0.0                 | 0.91.0              | 0.14.23                        | ROS Noetic              |
 
 ### Internal ifm3d-ros subpackage version structure
 Please see the internal subpackage version structure for a known `ifm3d-ros version`.
@@ -29,7 +28,6 @@ Please see the internal subpackage version structure for a known `ifm3d-ros vers
 | 1.0.1                 | 1.0.1                | 0.1.0              | 0.1.0                  |
 | 1.0.0                 | 0.7.0                | 0.1.0              | 0.1.0                  |
 
-
 ## Changelogs
 + ifm3d-ros: For changes between on the ifm3d-ros node source code, please see the respective information in the [CHANGELOG](CHANGELOG.rst).
 + ifm3d: For changes between on the ifm3d API source code, please see the respective information in the [ifm3d CHANGELOG](https://github.com/ifm/ifm3d/blob/main/ChangeLog.md).
@@ -65,4 +63,4 @@ Build for distributed systems <ifm3d_ros_driver/doc/distributed_build>
 :::
 
 ## LICENSE
-Please see the file called [LICENSE](LICENSE).
+Please see the file called [LICENSE](LICENSE).

docker/Dockerfile

@@ -39,10 +39,11 @@ RUN cd /home/ifm/ifm3d &&\
 
 # Clone and build ifm3d-ros repo
 SHELL ["/bin/bash", "-c"]
-# RUN mkdir -p /home/ifm/catkin_ws/src && \
-#     cd /home/ifm/catkin_ws/src && \
-    # git clone ${IFM3D_ROS_REPO} -b ${IFM3D_ROS_BRANCH} --single-branch
-ADD . /home/ifm/catkin_ws/src
+
+RUN mkdir -p /home/ifm/catkin_ws/src && \
+    cd /home/ifm/catkin_ws/src && \
+    git clone ${IFM3D_ROS_REPO} -b ${IFM3D_ROS_BRANCH} --single-branch
+
 RUN cd /home/ifm/catkin_ws && \
     rosdep update --rosdistro=${ROS_DISTRO} && \
     rosdep install --from-path src -y --ignore-src

docker/Dockerfile_buildstage_only

@@ -46,7 +46,9 @@ RUN apt-get update && apt-get install -y \
     ros-noetic-tf \
     ros-noetic-image-transport
 
-ADD . /home/ifm/catkin_ws/src
+RUN mkdir -p /home/ifm/catkin_ws/src && \
+    cd /home/ifm/catkin_ws/src && \
+    git clone ${IFM3D_ROS_REPO} -b ${IFM3D_ROS_BRANCH} --single-branch
 
 RUN cd /home/ifm/catkin_ws && \
     source /opt/ros/${ROS_DISTRO}/setup.bash && \

docker/build_container.sh

@@ -6,7 +6,6 @@ set -euo pipefail
 ##############
 ARCH="amd64"
 BASE_IMAGE="amd64/ros"
-TAG=ifm3d-ros_133:noetic-amd64_1.1.2
 
 ##############
 # For ARM64V8:
@@ -20,11 +19,12 @@ TAG=ifm3d-ros_133:noetic-amd64_1.1.2
 ##############
 BUILD_IMAGE_TAG="noetic"
 FINAL_IMAGE_TAG="noetic-ros-core"
-IFM3D_VERSION="1.3.3"
+IFM3D_VERSION="1.5.3"
 IFM3D_ROS_REPO="https://github.com/ifm/ifm3d-ros"
-IFM3D_ROS_BRANCH="dev1.2"
+IFM3D_ROS_BRANCH="v1.1.2"
 UBUNTU_VERSION="20.04"
 
+TAG=ifm3d-ros_${IFM3D_VERSION}:${BUILD_IMAGE_TAG}-${ARCH}_${IFM3D_ROS_BRANCH}
 ##############
 # Build the Docker container
 ##############

docker/docker-compose_IPC.yml

@@ -3,7 +3,7 @@ services:
 
   ifm3d_ros:
     tty: true
-    image: ifm3d-ros_133:noetic-amd64_1.1.2
+    image: ifm3d-ros_143:noetic-amd64_1.1.2
     restart: unless-stopped
     volumes:
       - ./hosts_IPC:/etc/hosts/

docker/docker-compose_VPU.yml

@@ -2,7 +2,7 @@ version: "2.3"
 services:
   ifm3d_ros:
     tty: true
-    image: ifm3d-ros_133:noetic-arm64_v8_1.1.2
+    image: ifm3d-ros_143:noetic-arm64_v8_1.1.2
 
     restart: unless-stopped
     volumes:

docker/docker-compose_docker_network.yml

@@ -2,7 +2,7 @@ version: "2.3"
 services:
   ifm3d_ros:
     tty: true
-    image: ifm3d-ros_133:noetic-arm64_v8_1.1.2
+    image: ifm3d-ros_143:noetic-arm64_v8_1.1.2
 
     extra_hosts:
       - "dockerhost:172.20.0.1"