Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ros_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- '.ci/**'
- '.github/workflows/ros_ci.yaml'
- 'ros/rolling/**'
- 'ros/lyrical/**'
- 'ros/kilted/**'
- 'ros/jazzy/**'
- 'ros/humble/**'
Expand All @@ -15,6 +16,7 @@ on:
- '.ci/**'
- '.github/workflows/ros_ci.yaml'
- 'ros/rolling/**'
- 'ros/lyrical/**'
- 'ros/kilted/**'
- 'ros/jazzy/**'
- 'ros/humble/**'
Expand All @@ -27,7 +29,8 @@ jobs:
fail-fast: false
matrix:
env:
- {HUB_REPO: ros, HUB_RELEASE: rolling, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: noble}
- {HUB_REPO: ros, HUB_RELEASE: rolling, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: resolute}
- {HUB_REPO: ros, HUB_RELEASE: lyrical, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: resolute}
- {HUB_REPO: ros, HUB_RELEASE: kilted, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: noble}
- {HUB_REPO: ros, HUB_RELEASE: jazzy, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: noble}
- {HUB_REPO: ros, HUB_RELEASE: humble, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: jammy}
Expand Down
78 changes: 78 additions & 0 deletions ros/lyrical/ubuntu/resolute/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
all: help

help:
@echo ""
@echo "-- Help Menu"
@echo ""
@echo " 1. make build - build all images"
@echo " 2. make pull - pull all images"
@echo " 3. make clean - remove all images"
@echo ""

build:
@docker build --tag=ros:lyrical-ros-core-noble ros-core/.
@docker build --tag=ros:lyrical-ros-base-noble ros-base/.
@docker build --tag=ros:lyrical-perception-noble perception/.
# @docker build --tag=osrf/ros:lyrical-simulation-noble simulation/.
# @docker build --tag=osrf/ros:lyrical-desktop-noble desktop/.
# @docker build --tag=osrf/ros:lyrical-desktop-full-noble desktop-full/.

pull:
@docker pull ros:lyrical-ros-core-noble
@docker pull ros:lyrical-ros-base-noble
@docker pull ros:lyrical-perception-noble
# @docker pull osrf/ros:lyrical-simulation-noble
# @docker pull osrf/ros:lyrical-desktop-noble
# @docker pull osrf/ros:lyrical-desktop-full-noble

clean:
@docker rmi -f ros:lyrical-ros-core-noble
@docker rmi -f ros:lyrical-ros-base-noble
@docker rmi -f ros:lyrical-perception-noble
# @docker rmi -f osrf/ros:lyrical-simulation-noble
# @docker rmi -f osrf/ros:lyrical-desktop-noble
# @docker rmi -f osrf/ros:lyrical-desktop-full-noble

ci_buildx:
@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:lyrical-desktop-noble \
--cache-to=type=inline \
--tag=osrf/ros:lyrical-desktop-noble \
desktop/.
@if [ "ubuntu" = "ubuntu" ]; then \
docker pull \
osrf/ros:lyrical-desktop-noble; \
docker tag \
osrf/ros:lyrical-desktop-noble \
osrf/ros:lyrical-desktop; \
docker push \
osrf/ros:lyrical-desktop; \
fi
@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:lyrical-simulation-noble \
--cache-to=type=inline \
--tag=osrf/ros:lyrical-simulation-noble \
simulation/.
@if [ "ubuntu" = "ubuntu" ]; then \
docker pull \
osrf/ros:lyrical-simulation-noble; \
docker tag \
osrf/ros:lyrical-simulation-noble \
osrf/ros:lyrical-simulation; \
docker push \
osrf/ros:lyrical-simulation; \
fi
@docker buildx build --pull --push \
--cache-from=type=registry,ref=osrf/ros:lyrical-desktop-full-noble \
--cache-to=type=inline \
--tag=osrf/ros:lyrical-desktop-full-noble \
desktop-full/.
@if [ "ubuntu" = "ubuntu" ]; then \
docker pull \
osrf/ros:lyrical-desktop-full-noble; \
docker tag \
osrf/ros:lyrical-desktop-full-noble \
osrf/ros:lyrical-desktop-full; \
docker push \
osrf/ros:lyrical-desktop-full; \
fi
9 changes: 9 additions & 0 deletions ros/lyrical/ubuntu/resolute/desktop-full/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This is an auto generated Dockerfile for ros:desktop-full
# generated from docker_images_ros2/create_ros_image.Dockerfile.em
FROM osrf/ros:lyrical-desktop-resolute

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
ros-lyrical-desktop-full=0.13.0-3* \
&& rm -rf /var/lib/apt/lists/*

9 changes: 9 additions & 0 deletions ros/lyrical/ubuntu/resolute/desktop/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This is an auto generated Dockerfile for ros:desktop
# generated from docker_images_ros2/create_ros_image.Dockerfile.em
FROM ros:lyrical-ros-base-resolute

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
ros-lyrical-desktop=0.13.0-3* \
&& rm -rf /var/lib/apt/lists/*

54 changes: 54 additions & 0 deletions ros/lyrical/ubuntu/resolute/images.yaml.em
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
%YAML 1.1
# ROS2 Dockerfile database
---
images:
ros-core:
base_image: @(os_name):@(os_code_name)
maintainer_name: @(maintainer_name)
template_name: docker_images_ros2/create_ros_core_image.Dockerfile.em
entrypoint_name: docker_images_ros2/ros_entrypoint.sh
template_packages:
- docker_templates
ros2_packages:
- ros-core
ros-base:
base_image: @(user_name):@(ros2distro_name)-ros-core-@(os_code_name)
maintainer_name: @(maintainer_name)
template_name: docker_images_ros2/create_ros_image.Dockerfile.em
template_packages:
- docker_templates
ros2_packages:
- ros-base
bootstrap_ros_tools:
perception:
base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
maintainer_name: @(maintainer_name)
template_name: docker_images_ros2/create_ros_image.Dockerfile.em
template_packages:
- docker_templates
ros2_packages:
- perception
simulation:
base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
maintainer_name: @(maintainer_name)
template_name: docker_images_ros2/create_ros_image.Dockerfile.em
template_packages:
- docker_templates
ros2_packages:
- simulation
desktop:
base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
maintainer_name: @(maintainer_name)
template_name: docker_images_ros2/create_ros_image.Dockerfile.em
template_packages:
- docker_templates
ros2_packages:
- desktop
desktop-full:
base_image: osrf/@(user_name):@(ros2distro_name)-desktop-@(os_code_name)
maintainer_name: @(maintainer_name)
template_name: docker_images_ros2/create_ros_image.Dockerfile.em
template_packages:
- docker_templates
ros2_packages:
- desktop-full
9 changes: 9 additions & 0 deletions ros/lyrical/ubuntu/resolute/perception/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This is an auto generated Dockerfile for ros:perception
# generated from docker_images_ros2/create_ros_image.Dockerfile.em
FROM ros:lyrical-ros-base-resolute

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
ros-lyrical-perception=0.13.0-3* \
&& rm -rf /var/lib/apt/lists/*

12 changes: 12 additions & 0 deletions ros/lyrical/ubuntu/resolute/platform.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
%YAML 1.1
# ROS2 Dockerfile database
---
platform:
os_name: ubuntu
os_code_name: resolute
ros2distro_name: lyrical
user_name: ros
maintainer_name:
arch: amd64
type: distribution
version:
31 changes: 31 additions & 0 deletions ros/lyrical/ubuntu/resolute/ros-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This is an auto generated Dockerfile for ros:ros-base
# generated from docker_images_ros2/create_ros_image.Dockerfile.em
FROM ros:lyrical-ros-core-resolute

# install bootstrap tools
RUN apt-get update && apt-get install --no-install-recommends -y \
build-essential \
git \
python3-colcon-common-extensions \
python3-colcon-mixin \
python3-rosdep \
python3-vcstool \
&& rm -rf /var/lib/apt/lists/*

# bootstrap rosdep
RUN rosdep init && \
rosdep update --rosdistro $ROS_DISTRO

# setup colcon mixin and metadata
RUN colcon mixin add default \
https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml && \
colcon mixin update && \
colcon metadata add default \
https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml && \
colcon metadata update

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
ros-lyrical-ros-base=0.13.0-3* \
&& rm -rf /var/lib/apt/lists/*

44 changes: 44 additions & 0 deletions ros/lyrical/ubuntu/resolute/ros-core/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# This is an auto generated Dockerfile for ros:ros-core
# generated from docker_images_ros2/create_ros_core_image.Dockerfile.em
FROM ubuntu:resolute

# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
apt-get update && \
apt-get install -q -y --no-install-recommends tzdata && \
rm -rf /var/lib/apt/lists/*

# install packages
RUN apt-get update && apt-get install -q -y --no-install-recommends \
ca-certificates \
curl \
dirmngr \
gnupg2 \
&& rm -rf /var/lib/apt/lists/*


# Setup ROS Apt sources
RUN curl -L -s -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-testing-apt-source_1.2.0.resolute_all.deb \
&& echo "a275b9b819874e745a928e83e39c429fa4d607159285c4ef3ebcf75afa732ee3 /tmp/ros2-apt-source.deb" | sha256sum --strict --check \
&& apt-get update \
&& apt-get install /tmp/ros2-apt-source.deb \
&& rm -f /tmp/ros2-apt-source.deb \
&& rm -rf /var/lib/apt/lists/*

# setup environment
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

ENV ROS_DISTRO=lyrical

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
ros-lyrical-ros-core=0.13.0-3* \
&& rm -rf /var/lib/apt/lists/*

# setup entrypoint
COPY ./ros_entrypoint.sh /

ENTRYPOINT ["/ros_entrypoint.sh"]
CMD ["bash"]
6 changes: 6 additions & 0 deletions ros/lyrical/ubuntu/resolute/ros-core/ros_entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
set -e

# setup ros2 environment
source "/opt/ros/$ROS_DISTRO/setup.bash" --
exec "$@"
9 changes: 9 additions & 0 deletions ros/lyrical/ubuntu/resolute/simulation/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This is an auto generated Dockerfile for ros:simulation
# generated from docker_images_ros2/create_ros_image.Dockerfile.em
FROM ros:lyrical-ros-base-resolute

# install ros2 packages
RUN apt-get update && apt-get install -y --no-install-recommends \
ros-lyrical-simulation=0.13.0-3* \
&& rm -rf /var/lib/apt/lists/*

24 changes: 24 additions & 0 deletions ros/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,30 @@ release_names:
aliases:
- "$release_name-perception"
- "$release_name-perception-$os_code_name"
lyrical:
eol: 2031-05
os_names:
ubuntu:
os_code_names:
resolute:
<<: *DEFAULT_ROS2
archs:
- amd64
- arm64v8
tag_names:
ros-core:
aliases:
- "$release_name-ros-core"
- "$release_name-ros-core-$os_code_name"
ros-base:
aliases:
- "$release_name-ros-base"
- "$release_name-ros-base-$os_code_name"
- "$release_name"
perception:
aliases:
- "$release_name-perception"
- "$release_name-perception-$os_code_name"
rolling:
eol: 2022-05
os_names:
Expand Down
23 changes: 22 additions & 1 deletion ros/ros
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Architectures: amd64, arm64v8
GitCommit: eb5634cf92ba079897e44fb7541d3b78aa6cf717
Directory: ros/jazzy/ubuntu/noble/ros-core

Tags: jazzy-ros-base, jazzy-ros-base-noble, jazzy, latest
Tags: jazzy-ros-base, jazzy-ros-base-noble, jazzy
Architectures: amd64, arm64v8
GitCommit: 0038f1c3a11aa0fc573d698b39ab5c204aad5a40
Directory: ros/jazzy/ubuntu/noble/ros-base
Expand Down Expand Up @@ -66,6 +66,27 @@ Architectures: amd64, arm64v8
GitCommit: b835a530495c0b411a0d15db858710a2748ee0a0
Directory: ros/kilted/ubuntu/noble/perception

################################################################################
# Release: lyrical

########################################
# Distro: ubuntu:resolute

Tags: lyrical-ros-core, lyrical-ros-core-noble, latest
Architectures: amd64, arm64v8
GitCommit: 179d41c4777f9a3fed7a8405825f704b9176f789
Directory: ros/lyrical/ubuntu/resolute/ros-core

Tags: lyrical-ros-base, lyrical-ros-base-noble, lyrical
Architectures: amd64, arm64v8
GitCommit: 179d41c4777f9a3fed7a8405825f704b9176f789
Directory: ros/lyrical/ubuntu/resolute/ros-base

Tags: lyrical-perception, lyrical-perception-noble
Architectures: amd64, arm64v8
GitCommit: 179d41c4777f9a3fed7a8405825f704b9176f789
Directory: ros/lyrical/ubuntu/noble/perception


################################################################################
# Release: rolling
Expand Down
Loading