From 9dd46f4274f7136e7974adcd804d0886ba208776 Mon Sep 17 00:00:00 2001 From: CihatAltiparmak Date: Tue, 28 Jan 2025 02:52:18 +0300 Subject: [PATCH] Create BASE_IMAGE argument to fix rolling nightly builds Signed-off-by: CihatAltiparmak --- .github/workflows/build_images.yaml | 2 ++ Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_images.yaml b/.github/workflows/build_images.yaml index c370559..3489166 100644 --- 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 index 2e288d8..284f1d9 100644 --- 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 \