Skip to content

Commit eb35e27

Browse files
authored
Merge pull request #206 from osrf/ros2_crystal
[ROS] Adding ROS2 images for Crystal, Bouncy, Ardent
2 parents 35495fc + 56c98f7 commit eb35e27

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+688
-528
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ install:
1111

1212
env:
1313
# ros2
14-
- HUB_REPO=ros2 HUB_RELEASE=ardent HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial
15-
- HUB_REPO=ros2 HUB_RELEASE=bouncy HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=bionic
14+
- HUB_REPO=ros HUB_RELEASE=crystal HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=bionic
15+
- HUB_REPO=ros HUB_RELEASE=bouncy HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=bionic
16+
- HUB_REPO=ros HUB_RELEASE=ardent HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial
1617
# ros
1718
- HUB_REPO=ros HUB_RELEASE=melodic HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=bionic
1819
- HUB_REPO=ros HUB_RELEASE=melodic HUB_OS_NAME=debian HUB_OS_CODE_NAME=stretch

README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ This repo hosts the Dockerfiles used to generate the official images for OSRF pr
4343
* amd64 [![Docker Build Status](https://img.shields.io/docker/build/osrf/gazebo.svg)](https://hub.docker.com/r/osrf/gazebo/builds/)
4444

4545

46-
### [SROS ![Docker Pulls](https://img.shields.io/docker/pulls/osrf/sros.svg) ![Docker Stars](https://img.shields.io/docker/stars/osrf/sros.svg)](https://registry.hub.docker.com/u/osrf/sros/)
47-
[![Compare Images](https://images.microbadger.com/badges/image/osrf/sros.svg)](https://microbadger.com/#/images/osrf/sros)
48-
49-
* amd64 [![Docker Build Status](https://img.shields.io/docker/build/osrf/sros.svg)](https://hub.docker.com/r/osrf/sros/builds/)
50-
51-
5246
### [ROS Legacy ![Docker Pulls](https://img.shields.io/docker/pulls/osrf/ros_legacy.svg) ![Docker Stars](https://img.shields.io/docker/stars/osrf/ros_legacy.svg)](https://registry.hub.docker.com/u/osrf/ros_legacy/)
5347
[![Compare Images](https://images.microbadger.com/badges/image/osrf/ros_legacy.svg)](https://microbadger.com/#/images/osrf/ros_legacy)
5448

File renamed without changes.
File renamed without changes.
File renamed without changes.

ros/.config/ros2/Makefile.em

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
all: help
2+
3+
help:
4+
@echo ""
5+
@echo "-- Help Menu"
6+
@echo ""
7+
@echo " 1. make build - build all images"
8+
@echo " 2. make pull - pull all images"
9+
@echo " 3. make clean - remove all images"
10+
@echo ""
11+
12+
build:
13+
@docker build --tag=ros:$release_name-ros-core-$os_code_name ros-core/.
14+
@docker build --tag=ros:$release_name-ros-base-$os_code_name ros-base/.
15+
# @docker build --tag=osrf/ros:$release_name-desktop-$os_code_name desktop/.
16+
# @docker build --tag=osrf/ros:$release_name-ros1-bridge-$os_code_name ros1-bridge/.
17+
18+
pull:
19+
@docker pull ros:$release_name-ros-core-$os_code_name
20+
@docker pull ros:$release_name-ros-base-$os_code_name
21+
# @docker pull osrf/ros:$release_name-desktop-$os_code_name
22+
# @docker pull osrf/ros:$release_name-ros1-bridge-$os_code_name
23+
24+
clean:
25+
@docker rmi -f ros:$release_name-ros-core-$os_code_name
26+
@docker rmi -f ros:$release_name-ros-base-$os_code_name
27+
# @docker rmi -f osrf/ros:$release_name-desktop-$os_code_name
28+
# @docker rmi -f osrf/ros:$release_name-ros1-bridge-$os_code_name

ros2/ardent/ubuntu/xenial/images.yaml.em renamed to ros/.config/ros2/images.yaml.em

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,36 @@ images:
55
ros-core:
66
base_image: @(os_name):@(os_code_name)
77
maintainer_name: @(maintainer_name)
8-
template_name: docker_images/create_ros2_core_image.Dockerfile.em
9-
entrypoint_name: docker_images/ros2_entrypoint.sh
8+
template_name: docker_images_ros2/create_ros_core_image.Dockerfile.em
9+
entrypoint_name: docker_images_ros2/ros_entrypoint.sh
1010
pip3_install:
1111
- argcomplete
1212
template_packages:
1313
- docker_templates
1414
ros2_packages:
1515
- ros-core
1616
ros-base:
17-
base_image: osrf/@(user_name):@(ros2distro_name)-ros-core
17+
base_image: @(user_name):@(ros2distro_name)-ros-core-@(os_code_name)
1818
maintainer_name: @(maintainer_name)
19-
template_name: docker_images/create_ros2_image.Dockerfile.em
19+
template_name: docker_images_ros2/create_ros_image.Dockerfile.em
2020
template_packages:
2121
- docker_templates
2222
ros2_packages:
2323
- ros-base
2424
desktop:
25-
base_image: osrf/@(user_name):@(ros2distro_name)-ros-base
25+
base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
2626
maintainer_name: @(maintainer_name)
27-
template_name: docker_images/create_ros2_image.Dockerfile.em
27+
template_name: docker_images_ros2/create_ros_image.Dockerfile.em
2828
template_packages:
2929
- docker_templates
3030
ros2_packages:
3131
- desktop
3232
ros1-bridge:
33-
base_image: osrf/@(user_name):@(ros2distro_name)-desktop
33+
base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
3434
maintainer_name: @(maintainer_name)
35-
template_name: docker_images/create_ros2_ros1_bridge_image.Dockerfile.em
36-
entrypoint_name: docker_images/ros1_bridge_entrypoint.sh
35+
template_name: docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em
36+
entrypoint_name: docker_images_ros2/ros1_bridge/ros_entrypoint.sh
3737
template_packages:
3838
- docker_templates
3939
ros2_packages:
4040
- ros1-bridge
41-
- turtlebot2-demo

ros2/.config/platform.yaml.em renamed to ros/.config/ros2/platform.yaml.em

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ platform:
66
os_code_name: $os_code_name
77
rosdistro_name: $rosdistro_name
88
ros2distro_name: $release_name
9-
user_name: ros2
9+
user_name: ros
1010
maintainer_name:
1111
arch: amd64
1212
type: distribution
13-
version: false
13+
version:

ros/ardent/ubuntu/xenial/Makefile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
all: help
2+
3+
help:
4+
@echo ""
5+
@echo "-- Help Menu"
6+
@echo ""
7+
@echo " 1. make build - build all images"
8+
@echo " 2. make pull - pull all images"
9+
@echo " 3. make clean - remove all images"
10+
@echo ""
11+
12+
build:
13+
@docker build --tag=ros:ardent-ros-core-xenial ros-core/.
14+
@docker build --tag=ros:ardent-ros-base-xenial ros-base/.
15+
# @docker build --tag=osrf/ros:ardent-desktop-xenial desktop/.
16+
# @docker build --tag=osrf/ros:ardent-ros1-bridge-xenial ros1-bridge/.
17+
18+
pull:
19+
@docker pull ros:ardent-ros-core-xenial
20+
@docker pull ros:ardent-ros-base-xenial
21+
# @docker pull osrf/ros:ardent-desktop-xenial
22+
# @docker pull osrf/ros:ardent-ros1-bridge-xenial
23+
24+
clean:
25+
@docker rmi -f ros:ardent-ros-core-xenial
26+
@docker rmi -f ros:ardent-ros-base-xenial
27+
# @docker rmi -f osrf/ros:ardent-desktop-xenial
28+
# @docker rmi -f osrf/ros:ardent-ros1-bridge-xenial
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This is an auto generated Dockerfile for ros:desktop
2+
# generated from docker_images_ros2/create_ros_image.Dockerfile.em
3+
FROM ros:ardent-ros-base-xenial
4+
# install ros2 packages
5+
RUN apt-get update && apt-get install -y \
6+
ros-ardent-desktop=0.4.0-1* \
7+
&& rm -rf /var/lib/apt/lists/*
8+

0 commit comments

Comments
 (0)