From 31691f1a3b9d0e340a931977be6366c3b16808f5 Mon Sep 17 00:00:00 2001 From: "Patan, Rasheed Khan" Date: Thu, 18 Apr 2024 17:54:03 +0200 Subject: [PATCH 1/4] move docker files to main folder --- docker/Dockerfile => Dockerfile | 0 ...ockerfile_buildstage_only => Dockerfile_buildstage_only | 0 README.md | 7 +++---- docker/build_container.sh => build_container.sh | 0 4 files changed, 3 insertions(+), 4 deletions(-) rename docker/Dockerfile => Dockerfile (100%) rename docker/Dockerfile_buildstage_only => Dockerfile_buildstage_only (100%) rename docker/build_container.sh => build_container.sh (100%) diff --git a/docker/Dockerfile b/Dockerfile similarity index 100% rename from docker/Dockerfile rename to Dockerfile diff --git a/docker/Dockerfile_buildstage_only b/Dockerfile_buildstage_only similarity index 100% rename from docker/Dockerfile_buildstage_only rename to Dockerfile_buildstage_only diff --git a/README.md b/README.md index f4b4dee..c02ac3e 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,13 @@ | **ifm3d-ros version** | **ifm3d version** | **embedded O3R FW version** | **ROS distribution(s)** | | --------------------- | ----------------- | --------------------------- | ----------------------- | -| 1.1.2 | 1.3.3 | 1.0.14 | ROS Noetic | +| 1.1.2 | 1.4.3 | 1.4.22 | ROS Noetic | +| 1.1.2 | 1.3.3 | 1.0.14 / 1.1.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 +29,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 +64,4 @@ Build for distributed systems ::: ## LICENSE -Please see the file called [LICENSE](LICENSE). +Please see the file called [LICENSE](LICENSE). \ No newline at end of file diff --git a/docker/build_container.sh b/build_container.sh similarity index 100% rename from docker/build_container.sh rename to build_container.sh From 3130cd9e38f2970c6de2dd18d8028ac0c27db66e Mon Sep 17 00:00:00 2001 From: "Patan, Rasheed Khan" Date: Fri, 19 Apr 2024 10:13:00 +0200 Subject: [PATCH 2/4] change tags to current ifm3d api version --- build_container.sh | 4 ++-- docker/docker-compose_IPC.yml | 2 +- docker/docker-compose_VPU.yml | 2 +- docker/docker-compose_docker_network.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build_container.sh b/build_container.sh index b7ba64b..1669830 100755 --- a/build_container.sh +++ b/build_container.sh @@ -6,7 +6,7 @@ set -euo pipefail ############## ARCH="amd64" BASE_IMAGE="amd64/ros" -TAG=ifm3d-ros_133:noetic-amd64_1.1.2 +TAG=ifm3d-ros_143:noetic-amd64_1.1.2 ############## # For ARM64V8: @@ -20,7 +20,7 @@ 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.4.3" IFM3D_ROS_REPO="https://github.com/ifm/ifm3d-ros" IFM3D_ROS_BRANCH="dev1.2" UBUNTU_VERSION="20.04" diff --git a/docker/docker-compose_IPC.yml b/docker/docker-compose_IPC.yml index fe85735..88c7d38 100644 --- a/docker/docker-compose_IPC.yml +++ b/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/ diff --git a/docker/docker-compose_VPU.yml b/docker/docker-compose_VPU.yml index 340682d..442fea3 100644 --- a/docker/docker-compose_VPU.yml +++ b/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: diff --git a/docker/docker-compose_docker_network.yml b/docker/docker-compose_docker_network.yml index 073c4ff..7ca936d 100644 --- a/docker/docker-compose_docker_network.yml +++ b/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" From 2438b2f511f3eea8901fb437d4df5f7e257f351e Mon Sep 17 00:00:00 2001 From: "Patan, Rasheed Khan" Date: Tue, 25 Jun 2024 11:57:10 +0200 Subject: [PATCH 3/4] move docker related files to docker directory --- Dockerfile => docker/Dockerfile | 9 +++++---- .../Dockerfile_buildstage_only | 4 +++- build_container.sh => docker/build_container.sh | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) rename Dockerfile => docker/Dockerfile (92%) rename Dockerfile_buildstage_only => docker/Dockerfile_buildstage_only (91%) rename build_container.sh => docker/build_container.sh (88%) mode change 100755 => 100644 diff --git a/Dockerfile b/docker/Dockerfile similarity index 92% rename from Dockerfile rename to docker/Dockerfile index 823b495..69d0cda 100644 --- a/Dockerfile +++ b/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 diff --git a/Dockerfile_buildstage_only b/docker/Dockerfile_buildstage_only similarity index 91% rename from Dockerfile_buildstage_only rename to docker/Dockerfile_buildstage_only index 6bb4a11..15d4380 100644 --- a/Dockerfile_buildstage_only +++ b/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 && \ diff --git a/build_container.sh b/docker/build_container.sh old mode 100755 new mode 100644 similarity index 88% rename from build_container.sh rename to docker/build_container.sh index 1669830..edad5ae --- a/build_container.sh +++ b/docker/build_container.sh @@ -6,7 +6,6 @@ set -euo pipefail ############## ARCH="amd64" BASE_IMAGE="amd64/ros" -TAG=ifm3d-ros_143:noetic-amd64_1.1.2 ############## # For ARM64V8: @@ -20,11 +19,12 @@ TAG=ifm3d-ros_143:noetic-amd64_1.1.2 ############## BUILD_IMAGE_TAG="noetic" FINAL_IMAGE_TAG="noetic-ros-core" -IFM3D_VERSION="1.4.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 ############## From aff92052c2eb062acbe5679d071dd8adf0c1300a Mon Sep 17 00:00:00 2001 From: "Patan, Rasheed Khan" Date: Tue, 25 Jun 2024 12:03:45 +0200 Subject: [PATCH 4/4] Formatted document --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e2dabff..9f206fe 100644 --- a/README.md +++ b/README.md @@ -9,13 +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`.