Create BASE_IMAGE argument to fix rolling nightly builds

Signed-off-by: CihatAltiparmak <[email protected]>
ros-navigation · Jan 27, 2025 · 9dd46f4 · 9dd46f4
1 parent 6f1d318
commit 9dd46f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/build_images.yaml b/.github/workflows/build_images.yaml
@@ -40,6 +40,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           build-args: |
             ROS_DISTRO=${{ matrix.ros_distro }}
+            BASE_IMAGE=${{ matrix.version.ros_distro == 'rolling' && 'osrf/ros2:nightly' || format('osrf/ros-{0}-desktop-full', matrix.version.ros_distro) }}
             BUILD=true
 
   release_docker:
@@ -158,5 +159,6 @@ jobs:
           platforms: linux/amd64,linux/arm64
           build-args: |
             ROS_DISTRO=${{ matrix.version.ros_distro }}
+            BASE_IMAGE=${{ format('osrf/ros-{0}-desktop-full', matrix.version.ros_distro) }}
             BUILD=true
             VERSION=${{ steps.get_tag.outputs.highest_tag }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,6 @@
 ARG ROS_DISTRO=rolling
-FROM osrf/ros:${ROS_DISTRO}-desktop-full
+ARG BASE_IMAGE=osrf/ros:${ROS_DISTRO}-desktop-full
+FROM $BASE_IMAGE
 
 RUN apt update \
     && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends --no-install-suggests \