move docker related files to docker directory

ifm · Jun 25, 2024 · 2438b2f · 2438b2f
1 parent 3130cd9
commit 2438b2f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/Dockerfile → docker/Dockerfile b/Dockerfile → 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 → docker/Dockerfile_buildstage_only b/Dockerfile_buildstage_only → 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 → docker/build_container.sh b/build_container.sh → 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
 ##############