Skip to content

Commit

Permalink
Merge pull request #170 from osrf/bouncy_update
Browse files Browse the repository at this point in the history
[ros2] Bouncy docker images
  • Loading branch information
mikaelarguedas authored Jul 1, 2018
2 parents 6a97f84 + 0ce64c8 commit 1013056
Show file tree
Hide file tree
Showing 15 changed files with 337 additions and 17 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ install:
env:
# ros2
- HUB_REPO=ros2 HUB_RELEASE=ardent HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial
- HUB_REPO=ros2 HUB_RELEASE=bouncy HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=bionic
# ros
- HUB_REPO=ros HUB_RELEASE=melodic HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=bionic
- HUB_REPO=ros HUB_RELEASE=melodic HUB_OS_NAME=debian HUB_OS_CODE_NAME=stretch
Expand Down
2 changes: 1 addition & 1 deletion ros2/.config/platform.yaml.em
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
platform:
os_name: $os_name
os_code_name: $os_code_name
rosdistro_name: kinetic
rosdistro_name: $rosdistro_name
ros2distro_name: $release_name
user_name: ros2
maintainer_name:
Expand Down
28 changes: 28 additions & 0 deletions ros2/bouncy/ubuntu/bionic/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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=osrf/ros2:bouncy-core bouncy-core/.
@docker build --tag=osrf/ros2:bouncy-basic bouncy-basic/.
@docker build --tag=osrf/ros2:bouncy-full bouncy-full/.
@docker build --tag=osrf/ros2:bouncy-ros1-bridge bouncy-ros1-bridge/.

pull:
@docker pull osrf/ros2:bouncy-core
@docker pull osrf/ros2:bouncy-basic
@docker pull osrf/ros2:bouncy-full
@docker pull osrf/ros2:bouncy-ros1-bridge

clean:
@docker rmi -f osrf/ros2:bouncy-core
@docker rmi -f osrf/ros2:bouncy-basic
@docker rmi -f osrf/ros2:bouncy-full
@docker rmi -f osrf/ros2:bouncy-ros1-bridge
39 changes: 39 additions & 0 deletions ros2/bouncy/ubuntu/bionic/bouncy-basic/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# This is an auto generated Dockerfile for ros2:bouncy-basic
# generated from docker_images/create_ros2_image.Dockerfile.em
FROM osrf/ros2:bouncy-core

# install packages
RUN apt-get update && apt-get install -q -y \
python3-pip \
&& rm -rf /var/lib/apt/lists/*

# install python packages
RUN pip3 install -U \
argcomplete
# install ros2 packages
RUN apt-get update && apt-get install -y \
ros-bouncy-common-interfaces \
ros-bouncy-composition \
ros-bouncy-demo-nodes-cpp \
ros-bouncy-demo-nodes-cpp-native \
ros-bouncy-demo-nodes-py \
ros-bouncy-examples* \
ros-bouncy-launch \
ros-bouncy-lifecycle \
ros-bouncy-logging-demo \
ros-bouncy-ros2launch \
ros-bouncy-ros2lifecycle \
ros-bouncy-ros2msg \
ros-bouncy-ros2node \
ros-bouncy-ros2param \
ros-bouncy-ros2pkg \
ros-bouncy-ros2run \
ros-bouncy-ros2service \
ros-bouncy-ros2srv \
ros-bouncy-ros2topic \
ros-bouncy-sros2 \
ros-bouncy-tf2* \
ros-bouncy-tlsf* \
ros-bouncy-topic-monitor \
&& rm -rf /var/lib/apt/lists/*

48 changes: 48 additions & 0 deletions ros2/bouncy/ubuntu/bionic/bouncy-core/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# This is an auto generated Dockerfile for ros2:bouncy-core
# generated from docker_images/create_ros2_core_image.Dockerfile.em
FROM ubuntu:bionic

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


# install packages
RUN apt-get update && apt-get install -q -y \
dirmngr \
gnupg2 \
lsb-release \
&& rm -rf /var/lib/apt/lists/*

# setup ros1 keys
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116

# setup sources.list
RUN echo "deb http://packages.ros.org/ros/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros-latest.list

# setup ros2 keys
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116

# setup sources.list
RUN . /etc/os-release \
&& echo "deb http://repo.ros2.org/$ID/main `lsb_release -sc` main" > /etc/apt/sources.list.d/ros2-latest.list

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV ROS_DISTRO melodic
ENV ROS2_DISTRO bouncy


# install ros2 packages
RUN apt-get update && apt-get install -y \
ros-bouncy-rclcpp \
ros-bouncy-rclpy \
ros-bouncy-ros-environment \
&& rm -rf /var/lib/apt/lists/*

# setup entrypoint
COPY ./ros2_entrypoint.sh /

ENTRYPOINT ["/ros2_entrypoint.sh"]
CMD ["bash"]
6 changes: 6 additions & 0 deletions ros2/bouncy/ubuntu/bionic/bouncy-core/ros2_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/$ROS2_DISTRO/setup.bash"
exec "$@"
28 changes: 28 additions & 0 deletions ros2/bouncy/ubuntu/bionic/bouncy-full/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This is an auto generated Dockerfile for ros2:bouncy-full
# generated from docker_images/create_ros2_image.Dockerfile.em
FROM osrf/ros2:bouncy-basic
# install ros2 packages
RUN apt-get update && apt-get install -y \
ros-bouncy-angles \
ros-bouncy-astra-camera \
ros-bouncy-cartographer-ros \
ros-bouncy-depthimage-to-laserscan \
ros-bouncy-depthimage-to-pointcloud2 \
ros-bouncy-dummy-map-server \
ros-bouncy-dummy-robot-bringup \
ros-bouncy-dummy-sensors \
ros-bouncy-image-tools \
ros-bouncy-intra-process-demo \
ros-bouncy-joy \
ros-bouncy-launch-testing \
ros-bouncy-map-server \
ros-bouncy-pcl-conversions \
ros-bouncy-pendulum-control \
ros-bouncy-robot-state-publisher \
ros-bouncy-rosidl-default-generators \
ros-bouncy-rviz2 \
ros-bouncy-rviz-default-plugins \
ros-bouncy-teleop-twist-joy \
ros-bouncy-teleop-twist-keyboard \
&& rm -rf /var/lib/apt/lists/*

14 changes: 14 additions & 0 deletions ros2/bouncy/ubuntu/bionic/bouncy-ros1-bridge/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This is an auto generated Dockerfile for ros2:bouncy-ros1-bridge
# generated from docker_images/create_ros2_image.Dockerfile.em
FROM osrf/ros2:bouncy-full
# install ros2 packages
RUN apt-get update && apt-get install -y \
ros-bouncy-ros1-bridge \
ros-bouncy-turtlebot2* \
&& rm -rf /var/lib/apt/lists/*

# setup entrypoint
COPY ./ros1_bridge_entrypoint.sh /

ENTRYPOINT ["/ros1_bridge_entrypoint.sh"]
CMD ["bash"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
set -e

# setup ros1 environment
source "/opt/ros/$ROS_DISTRO/setup.bash"

# setup ros2 environment
source "/opt/ros/$ROS2_DISTRO/setup.bash"
exec "$@"
85 changes: 85 additions & 0 deletions ros2/bouncy/ubuntu/bionic/images.yaml.em
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
%YAML 1.1
# ROS2 Dockerfile database
---
images:
@(ros2distro_name)-core:
base_image: @(os_name):@(os_code_name)
maintainer_name: @(maintainer_name)
template_name: docker_images/create_ros2_core_image.Dockerfile.em
entrypoint_name: docker_images/ros2_entrypoint.sh
template_packages:
- docker_templates
ros2_packages:
- rclcpp
- rclpy
- ros-environment
@(ros2distro_name)-basic:
base_image: osrf/@(user_name):@(ros2distro_name)-core
maintainer_name: @(maintainer_name)
template_name: docker_images/create_ros2_image.Dockerfile.em
template_packages:
- docker_templates
pip3_install:
- argcomplete
ros2_packages:
- common-interfaces
- composition
- demo-nodes-cpp
- demo-nodes-cpp-native
- demo-nodes-py
- examples*
- launch
- lifecycle
- logging-demo
- ros2launch
- ros2lifecycle
- ros2msg
- ros2node
- ros2param
- ros2pkg
- ros2run
- ros2service
- ros2srv
- ros2topic
- sros2
- tf2*
- tlsf*
- topic-monitor
@(ros2distro_name)-full:
base_image: osrf/@(user_name):@(ros2distro_name)-basic
maintainer_name: @(maintainer_name)
template_name: docker_images/create_ros2_image.Dockerfile.em
template_packages:
- docker_templates
ros2_packages:
- angles
- astra-camera
- cartographer-ros
- depthimage-to-laserscan
- depthimage-to-pointcloud2
- dummy-map-server
- dummy-robot-bringup
- dummy-sensors
- image-tools
- intra-process-demo
- joy
- launch-testing
- map-server
- pcl-conversions
- pendulum-control
- robot-state-publisher
- rosidl-default-generators
- rviz2
- rviz-default-plugins
- teleop-twist-joy
- teleop-twist-keyboard
@(ros2distro_name)-ros1-bridge:
base_image: osrf/@(user_name):@(ros2distro_name)-full
maintainer_name: @(maintainer_name)
template_name: docker_images/create_ros2_image.Dockerfile.em
entrypoint_name: docker_images/ros1_bridge_entrypoint.sh
template_packages:
- docker_templates
ros2_packages:
- ros1-bridge
- turtlebot2*
13 changes: 13 additions & 0 deletions ros2/bouncy/ubuntu/bionic/platform.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
%YAML 1.1
# ROS2 Dockerfile database
---
platform:
os_name: ubuntu
os_code_name: bionic
rosdistro_name: melodic
ros2distro_name: bouncy
user_name: ros2
maintainer_name:
arch: amd64
type: distribution
version: false
26 changes: 25 additions & 1 deletion ros2/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ defaults:

release_names:
ardent:
eol:
eol: 2018-12
os_names:
ubuntu:
os_code_names:
xenial:
rosdistro_name: kinetic
<<: *DEFAULT
archs:
- amd64
Expand All @@ -36,6 +37,29 @@ release_names:
ardent-ros1-bridge:
aliases:
- "$release_name-ros1-bridge"
bouncy:
eol: 2019-07
os_names:
ubuntu:
os_code_names:
bionic:
rosdistro_name: melodic
<<: *DEFAULT
archs:
- amd64
tag_names:
bouncy-core:
aliases:
- "$release_name-core"
bouncy-basic:
aliases:
- "$release_name-basic"
bouncy-full:
aliases:
- "$release_name-full"
bouncy-ros1-bridge:
aliases:
- "$release_name-ros1-bridge"

meta:
maintainers:
Expand Down
27 changes: 27 additions & 0 deletions ros2/ros2
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,30 @@ Architectures: amd64
GitCommit: 80970653ea5fa178ef6ccbc7986a3b36ea36c845
Directory: ros2/ardent/ubuntu/xenial/ardent-ros1-bridge


################################################################################
# Release: bouncy

########################################
# Distro: ubuntu:bionic

Tags: bouncy-core
Architectures: amd64
GitCommit: 1cb171542012bcf9dda5aa658b0cbf76db95a3c8
Directory: ros2/bouncy/ubuntu/bionic/bouncy-core

Tags: bouncy-basic
Architectures: amd64
GitCommit: 1cb171542012bcf9dda5aa658b0cbf76db95a3c8
Directory: ros2/bouncy/ubuntu/bionic/bouncy-basic

Tags: bouncy-full
Architectures: amd64
GitCommit: 1cb171542012bcf9dda5aa658b0cbf76db95a3c8
Directory: ros2/bouncy/ubuntu/bionic/bouncy-full

Tags: bouncy-ros1-bridge
Architectures: amd64
GitCommit: 1cb171542012bcf9dda5aa658b0cbf76db95a3c8
Directory: ros2/bouncy/ubuntu/bionic/bouncy-ros1-bridge

Loading

0 comments on commit 1013056

Please sign in to comment.