From 7dd2ec87f1a0beb9b90d83ca06363f8d0554cb9c Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Thu, 25 Jan 2018 00:08:17 -0800 Subject: [PATCH 1/5] [ros2] update source dependencies and dockerfile --- ros2/source/images.yaml.em | 21 +++++++++++++++++++++ ros2/source/source/Dockerfile | 23 ++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ros2/source/images.yaml.em b/ros2/source/images.yaml.em index a0427f084..f5b50ba51 100644 --- a/ros2/source/images.yaml.em +++ b/ros2/source/images.yaml.em @@ -17,14 +17,23 @@ images: - cppcheck - git - libasio-dev + - libcurl4-openssl-dev - libeigen3-dev + - libgles2-mesa-dev + - libglu1-mesa-dev - libopencv-dev - libpoco-dev - libpocofoundation9v5 - libpocofoundation9v5-dbg + - libqt5core5a + - libqt5gui5 + - libqt5opengl5 + - libqt5widgets5 + - libopensplice67 - libssl-dev - libtinyxml-dev - libtinyxml2-dev + - libxaw7-dev - openssl - pydocstyle - pyflakes @@ -36,15 +45,27 @@ images: - python3-nose - python3-pep8 - python3-pip + - python3-pyparsing - python3-setuptools - python3-vcstool - python3-yaml + - qtbase5-dev - uncrustify - wget pip3_install: - argcomplete - flake8 + - flake8-blind-except + - flake8-builtins + - flake8-class-newline + - flake8-comprehensions + - flake8-deprecated + - flake8-docstrings - flake8-import-order + - flake8-quotes + - pytest + - pytest-cov + - pytest-runner ws: /root/ros2_ws ament_args: - build diff --git a/ros2/source/source/Dockerfile b/ros2/source/source/Dockerfile index f81529aec..56f7f8150 100644 --- a/ros2/source/source/Dockerfile +++ b/ros2/source/source/Dockerfile @@ -22,14 +22,23 @@ RUN apt-get update && apt-get install -q -y \ cppcheck \ git \ libasio-dev \ + libcurl4-openssl-dev \ libeigen3-dev \ + libgles2-mesa-dev \ + libglu1-mesa-dev \ libopencv-dev \ libpoco-dev \ libpocofoundation9v5 \ libpocofoundation9v5-dbg \ + libqt5core5a \ + libqt5gui5 \ + libqt5opengl5 \ + libqt5widgets5 \ + libopensplice67 \ libssl-dev \ libtinyxml-dev \ libtinyxml2-dev \ + libxaw7-dev \ openssl \ pydocstyle \ pyflakes \ @@ -41,9 +50,11 @@ RUN apt-get update && apt-get install -q -y \ python3-nose \ python3-pep8 \ python3-pip \ + python3-pyparsing \ python3-setuptools \ python3-vcstool \ python3-yaml \ + qtbase5-dev \ uncrustify \ wget \ && rm -rf /var/lib/apt/lists/* @@ -52,7 +63,17 @@ RUN apt-get update && apt-get install -q -y \ RUN pip3 install -U \ argcomplete \ flake8 \ - flake8-import-order + flake8-blind-except \ + flake8-builtins \ + flake8-class-newline \ + flake8-comprehensions \ + flake8-deprecated \ + flake8-docstrings \ + flake8-import-order \ + flake8-quotes \ + pytest \ + pytest-cov \ + pytest-runner # clone source ENV ROS2_WS /root/ros2_ws From 6305f8ee3c67112a32f5d511b19413ce3dc1a026 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Thu, 25 Jan 2018 00:11:28 -0800 Subject: [PATCH 2/5] [ros2] add new tags and replace r2b3 with ardent in manifest --- ros2/.config/Makefile.em | 8 ++++- ros2/.config/images.yaml.em | 59 ++++++++++++++++++++++++++++++++++++- ros2/manifest.yaml | 12 ++++++-- 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/ros2/.config/Makefile.em b/ros2/.config/Makefile.em index db0ab8043..db94b054c 100644 --- a/ros2/.config/Makefile.em +++ b/ros2/.config/Makefile.em @@ -11,12 +11,18 @@ help: build: @docker build --tag=osrf/ros2:$release_name-core $release_name-core/. - @docker build --tag=osrf/ros2:$release_name-ros1-bridge $release_name-ros1-bridge/. + @docker build --tag=osrf/ros2:$release_name-basic $release_name-basic/. + @docker build --tag=osrf/ros2:$release_name-full $release_name-full/. + @docker build --tag=osrf/ros2:$release_name-ros1-bridge $release_name-ros1-bridge/. pull: @docker pull osrf/ros2:$release_name-core + @docker pull osrf/ros2:$release_name-basic + @docker pull osrf/ros2:$release_name-full @docker pull osrf/ros2:$release_name-ros1-bridge clean: @docker rmi -f osrf/ros2:$release_name-core + @docker rmi -f osrf/ros2:$release_name-basic + @docker rmi -f osrf/ros2:$release_name-full @docker rmi -f osrf/ros2:$release_name-ros1-bridge diff --git a/ros2/.config/images.yaml.em b/ros2/.config/images.yaml.em index d9763449a..a813c8b91 100644 --- a/ros2/.config/images.yaml.em +++ b/ros2/.config/images.yaml.em @@ -7,6 +7,18 @@ images: 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 + packages: + - python3-pip + ros2_packages: + - rclcpp + - rclpy + @(ros2distro_name)-basic: + base_image: osrf/@(user_name):@(ros2distro_name)-core + maintainer_name: @(maintainer_name) + template_name: docker_images/create_ros2_image.Dockerfile.em + entrypoint_name: docker_images/ros2_entrypoint.sh template_packages: - docker_templates packages: @@ -14,12 +26,56 @@ images: pip3_install: - argcomplete ros2_packages: + - common-interfaces + - composition - demo-nodes-cpp + - demo-nodes-cpp-native - demo-nodes-py + - examples* + - launch + - lifecycle + - logging-demo + - ros2msg + - ros2node + - 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 + entrypoint_name: docker_images/ros2_entrypoint.sh + template_packages: + - docker_templates + ros2_packages: + - 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)-core + 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 @@ -27,3 +83,4 @@ images: - docker_templates ros2_packages: - ros1-bridge + - turtlebot2* diff --git a/ros2/manifest.yaml b/ros2/manifest.yaml index e91eec9fc..2f19a4048 100644 --- a/ros2/manifest.yaml +++ b/ros2/manifest.yaml @@ -14,7 +14,7 @@ defaults: platform: .config/platform.yaml.em release_names: - r2b3: + ardent: eol: os_names: ubuntu: @@ -24,10 +24,16 @@ release_names: archs: - amd64 tag_names: - r2b3-core: + ardent-core: aliases: - "$release_name-core" - r2b3-ros1-bridge: + ardent-basic: + aliases: + - "$release_name-basic" + ardent-full: + aliases: + - "$release_name-full" + ardent-ros1-bridge: aliases: - "$release_name-ros1-bridge" From a1a370ad4ad4b38e03085029bc85c131188a6487 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Thu, 25 Jan 2018 00:12:29 -0800 Subject: [PATCH 3/5] [ros2] commit generated ardent dockerfiles --- ros2/ardent/ubuntu/xenial/Makefile | 28 ++++++ .../ubuntu/xenial/ardent-basic/Dockerfile | 40 +++++++++ .../xenial/ardent-basic}/ros2_entrypoint.sh | 0 .../ubuntu/xenial/ardent-core}/Dockerfile | 13 +-- .../xenial/ardent-core/ros2_entrypoint.sh | 6 ++ .../ubuntu/xenial/ardent-full/Dockerfile | 32 +++++++ .../xenial/ardent-full/ros2_entrypoint.sh | 6 ++ .../xenial/ardent-ros1-bridge}/Dockerfile | 7 +- .../ros1_bridge_entrypoint.sh | 0 ros2/ardent/ubuntu/xenial/images.yaml.em | 87 +++++++++++++++++++ .../ubuntu/xenial/platform.yaml | 2 +- ros2/r2b3/ubuntu/xenial/Makefile | 22 ----- ros2/r2b3/ubuntu/xenial/images.yaml.em | 29 ------- 13 files changed, 208 insertions(+), 64 deletions(-) create mode 100644 ros2/ardent/ubuntu/xenial/Makefile create mode 100644 ros2/ardent/ubuntu/xenial/ardent-basic/Dockerfile rename ros2/{r2b3/ubuntu/xenial/r2b3-core => ardent/ubuntu/xenial/ardent-basic}/ros2_entrypoint.sh (100%) rename ros2/{r2b3/ubuntu/xenial/r2b3-core => ardent/ubuntu/xenial/ardent-core}/Dockerfile (81%) create mode 100755 ros2/ardent/ubuntu/xenial/ardent-core/ros2_entrypoint.sh create mode 100644 ros2/ardent/ubuntu/xenial/ardent-full/Dockerfile create mode 100755 ros2/ardent/ubuntu/xenial/ardent-full/ros2_entrypoint.sh rename ros2/{r2b3/ubuntu/xenial/r2b3-ros1-bridge => ardent/ubuntu/xenial/ardent-ros1-bridge}/Dockerfile (63%) rename ros2/{r2b3/ubuntu/xenial/r2b3-ros1-bridge => ardent/ubuntu/xenial/ardent-ros1-bridge}/ros1_bridge_entrypoint.sh (100%) create mode 100644 ros2/ardent/ubuntu/xenial/images.yaml.em rename ros2/{r2b3 => ardent}/ubuntu/xenial/platform.yaml (88%) delete mode 100644 ros2/r2b3/ubuntu/xenial/Makefile delete mode 100644 ros2/r2b3/ubuntu/xenial/images.yaml.em diff --git a/ros2/ardent/ubuntu/xenial/Makefile b/ros2/ardent/ubuntu/xenial/Makefile new file mode 100644 index 000000000..4c068d9cb --- /dev/null +++ b/ros2/ardent/ubuntu/xenial/Makefile @@ -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:ardent-core ardent-core/. + @docker build --tag=osrf/ros2:ardent-basic ardent-basic/. + @docker build --tag=osrf/ros2:ardent-full ardent-full/. + @docker build --tag=osrf/ros2:ardent-ros1-bridge ardent-ros1-bridge/. + +pull: + @docker pull osrf/ros2:ardent-core + @docker pull osrf/ros2:ardent-basic + @docker pull osrf/ros2:ardent-full + @docker pull osrf/ros2:ardent-ros1-bridge + +clean: + @docker rmi -f osrf/ros2:ardent-core + @docker rmi -f osrf/ros2:ardent-basic + @docker rmi -f osrf/ros2:ardent-full + @docker rmi -f osrf/ros2:ardent-ros1-bridge diff --git a/ros2/ardent/ubuntu/xenial/ardent-basic/Dockerfile b/ros2/ardent/ubuntu/xenial/ardent-basic/Dockerfile new file mode 100644 index 000000000..fcb52a02a --- /dev/null +++ b/ros2/ardent/ubuntu/xenial/ardent-basic/Dockerfile @@ -0,0 +1,40 @@ +# This is an auto generated Dockerfile for ros2:ardent-basic +# generated from docker_images/create_ros2_image.Dockerfile.em +FROM osrf/ros2:ardent-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-ardent-common-interfaces \ + ros-ardent-composition \ + ros-ardent-demo-nodes-cpp \ + ros-ardent-demo-nodes-cpp-native \ + ros-ardent-demo-nodes-py \ + ros-ardent-examples* \ + ros-ardent-launch \ + ros-ardent-lifecycle \ + ros-ardent-logging-demo \ + ros-ardent-ros2msg \ + ros-ardent-ros2node \ + ros-ardent-ros2pkg \ + ros-ardent-ros2run \ + ros-ardent-ros2service \ + ros-ardent-ros2srv \ + ros-ardent-ros2topic \ + ros-ardent-sros2 \ + ros-ardent-tf2* \ + ros-ardent-tlsf* \ + ros-ardent-topic-monitor \ + && rm -rf /var/lib/apt/lists/* + +# setup entrypoint +COPY ./ros2_entrypoint.sh / + +ENTRYPOINT ["/ros2_entrypoint.sh"] diff --git a/ros2/r2b3/ubuntu/xenial/r2b3-core/ros2_entrypoint.sh b/ros2/ardent/ubuntu/xenial/ardent-basic/ros2_entrypoint.sh similarity index 100% rename from ros2/r2b3/ubuntu/xenial/r2b3-core/ros2_entrypoint.sh rename to ros2/ardent/ubuntu/xenial/ardent-basic/ros2_entrypoint.sh diff --git a/ros2/r2b3/ubuntu/xenial/r2b3-core/Dockerfile b/ros2/ardent/ubuntu/xenial/ardent-core/Dockerfile similarity index 81% rename from ros2/r2b3/ubuntu/xenial/r2b3-core/Dockerfile rename to ros2/ardent/ubuntu/xenial/ardent-core/Dockerfile index 0bb712832..322335bdc 100644 --- a/ros2/r2b3/ubuntu/xenial/r2b3-core/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ardent-core/Dockerfile @@ -1,4 +1,4 @@ -# This is an auto generated Dockerfile for ros2:r2b3-core +# This is an auto generated Dockerfile for ros2:ardent-core # generated from docker_images/create_ros2_core_image.Dockerfile.em FROM ubuntu:xenial @@ -20,23 +20,18 @@ RUN . /etc/os-release \ ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 ENV ROS_DISTRO kinetic -ENV ROS2_DISTRO r2b3 +ENV ROS2_DISTRO ardent # 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-r2b3-demo-nodes-cpp \ - ros-r2b3-demo-nodes-py \ - ros-r2b3-ros2run \ - ros-r2b3-sros2 \ + ros-ardent-rclcpp \ + ros-ardent-rclpy \ && rm -rf /var/lib/apt/lists/* # setup entrypoint diff --git a/ros2/ardent/ubuntu/xenial/ardent-core/ros2_entrypoint.sh b/ros2/ardent/ubuntu/xenial/ardent-core/ros2_entrypoint.sh new file mode 100755 index 000000000..db46e2be3 --- /dev/null +++ b/ros2/ardent/ubuntu/xenial/ardent-core/ros2_entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e + +# setup ros2 environment +source "/opt/ros/$ROS2_DISTRO/setup.bash" +exec "$@" diff --git a/ros2/ardent/ubuntu/xenial/ardent-full/Dockerfile b/ros2/ardent/ubuntu/xenial/ardent-full/Dockerfile new file mode 100644 index 000000000..37bb51a39 --- /dev/null +++ b/ros2/ardent/ubuntu/xenial/ardent-full/Dockerfile @@ -0,0 +1,32 @@ +# This is an auto generated Dockerfile for ros2:ardent-full +# generated from docker_images/create_ros2_image.Dockerfile.em +FROM osrf/ros2:ardent-basic + +# install ros2 packages +RUN apt-get update && apt-get install -y \ + ros-ardent-astra-camera \ + ros-ardent-cartographer-ros \ + ros-ardent-depthimage-to-laserscan \ + ros-ardent-depthimage-to-pointcloud2 \ + ros-ardent-dummy-map-server \ + ros-ardent-dummy-robot-bringup \ + ros-ardent-dummy-sensors \ + ros-ardent-image-tools \ + ros-ardent-intra-process-demo \ + ros-ardent-joy \ + ros-ardent-launch-testing \ + ros-ardent-map-server \ + ros-ardent-pcl-conversions \ + ros-ardent-pendulum-control \ + ros-ardent-robot-state-publisher \ + ros-ardent-rosidl-default-generators \ + ros-ardent-rviz2 \ + ros-ardent-rviz-default-plugins \ + ros-ardent-teleop-twist-joy \ + ros-ardent-teleop-twist-keyboard \ + && rm -rf /var/lib/apt/lists/* + +# setup entrypoint +COPY ./ros2_entrypoint.sh / + +ENTRYPOINT ["/ros2_entrypoint.sh"] diff --git a/ros2/ardent/ubuntu/xenial/ardent-full/ros2_entrypoint.sh b/ros2/ardent/ubuntu/xenial/ardent-full/ros2_entrypoint.sh new file mode 100755 index 000000000..db46e2be3 --- /dev/null +++ b/ros2/ardent/ubuntu/xenial/ardent-full/ros2_entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e + +# setup ros2 environment +source "/opt/ros/$ROS2_DISTRO/setup.bash" +exec "$@" diff --git a/ros2/r2b3/ubuntu/xenial/r2b3-ros1-bridge/Dockerfile b/ros2/ardent/ubuntu/xenial/ardent-ros1-bridge/Dockerfile similarity index 63% rename from ros2/r2b3/ubuntu/xenial/r2b3-ros1-bridge/Dockerfile rename to ros2/ardent/ubuntu/xenial/ardent-ros1-bridge/Dockerfile index d01c20da7..22cbfeda2 100644 --- a/ros2/r2b3/ubuntu/xenial/r2b3-ros1-bridge/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ardent-ros1-bridge/Dockerfile @@ -1,10 +1,11 @@ -# This is an auto generated Dockerfile for ros2:r2b3-ros1-bridge +# This is an auto generated Dockerfile for ros2:ardent-ros1-bridge # generated from docker_images/create_ros2_image.Dockerfile.em -FROM osrf/ros2:r2b3-core +FROM osrf/ros2:ardent-full # install ros2 packages RUN apt-get update && apt-get install -y \ - ros-r2b3-ros1-bridge \ + ros-ardent-ros1-bridge \ + ros-ardent-turtlebot2* \ && rm -rf /var/lib/apt/lists/* # setup entrypoint diff --git a/ros2/r2b3/ubuntu/xenial/r2b3-ros1-bridge/ros1_bridge_entrypoint.sh b/ros2/ardent/ubuntu/xenial/ardent-ros1-bridge/ros1_bridge_entrypoint.sh similarity index 100% rename from ros2/r2b3/ubuntu/xenial/r2b3-ros1-bridge/ros1_bridge_entrypoint.sh rename to ros2/ardent/ubuntu/xenial/ardent-ros1-bridge/ros1_bridge_entrypoint.sh diff --git a/ros2/ardent/ubuntu/xenial/images.yaml.em b/ros2/ardent/ubuntu/xenial/images.yaml.em new file mode 100644 index 000000000..057811c48 --- /dev/null +++ b/ros2/ardent/ubuntu/xenial/images.yaml.em @@ -0,0 +1,87 @@ +%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 + packages: + - python3-pip + ros2_packages: + - rclcpp + - rclpy + @(ros2distro_name)-basic: + base_image: osrf/@(user_name):@(ros2distro_name)-core + maintainer_name: @(maintainer_name) + template_name: docker_images/create_ros2_image.Dockerfile.em + entrypoint_name: docker_images/ros2_entrypoint.sh + template_packages: + - docker_templates + packages: + - python3-pip + pip3_install: + - argcomplete + ros2_packages: + - common-interfaces + - composition + - demo-nodes-cpp + - demo-nodes-cpp-native + - demo-nodes-py + - examples* + - launch + - lifecycle + - logging-demo + - ros2msg + - ros2node + - 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 + entrypoint_name: docker_images/ros2_entrypoint.sh + template_packages: + - docker_templates + ros2_packages: + # - ament* + - 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* diff --git a/ros2/r2b3/ubuntu/xenial/platform.yaml b/ros2/ardent/ubuntu/xenial/platform.yaml similarity index 88% rename from ros2/r2b3/ubuntu/xenial/platform.yaml rename to ros2/ardent/ubuntu/xenial/platform.yaml index c693315fd..0ca7df810 100644 --- a/ros2/r2b3/ubuntu/xenial/platform.yaml +++ b/ros2/ardent/ubuntu/xenial/platform.yaml @@ -5,7 +5,7 @@ platform: os_name: ubuntu os_code_name: xenial rosdistro_name: kinetic - ros2distro_name: r2b3 + ros2distro_name: ardent user_name: ros2 maintainer_name: arch: amd64 diff --git a/ros2/r2b3/ubuntu/xenial/Makefile b/ros2/r2b3/ubuntu/xenial/Makefile deleted file mode 100644 index 668de4f10..000000000 --- a/ros2/r2b3/ubuntu/xenial/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -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:r2b3-core r2b3-core/. - @docker build --tag=osrf/ros2:r2b3-ros1-bridge r2b3-ros1-bridge/. - -pull: - @docker pull osrf/ros2:r2b3-core - @docker pull osrf/ros2:r2b3-ros1-bridge - -clean: - @docker rmi -f osrf/ros2:r2b3-core - @docker rmi -f osrf/ros2:r2b3-ros1-bridge diff --git a/ros2/r2b3/ubuntu/xenial/images.yaml.em b/ros2/r2b3/ubuntu/xenial/images.yaml.em deleted file mode 100644 index d9763449a..000000000 --- a/ros2/r2b3/ubuntu/xenial/images.yaml.em +++ /dev/null @@ -1,29 +0,0 @@ -%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 - packages: - - python3-pip - pip3_install: - - argcomplete - ros2_packages: - - demo-nodes-cpp - - demo-nodes-py - - ros2run - - sros2 - @(ros2distro_name)-ros1-bridge: - base_image: osrf/@(user_name):@(ros2distro_name)-core - 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 From 3a7328cf8e2d45cf5c370bd60da0eec3a0c35243 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Thu, 25 Jan 2018 00:12:43 -0800 Subject: [PATCH 4/5] [ros2] update ros2 docker library --- ros2/ros2 | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/ros2/ros2 b/ros2/ros2 index da01c3271..6c871a641 100644 --- a/ros2/ros2 +++ b/ros2/ros2 @@ -2,18 +2,28 @@ Maintainers: Tully Foote (@tfoote) GitRepo: https://github.com/osrf/docker_images.git ################################################################################ -# Release: r2b3 +# Release: ardent ######################################## # Distro: ubuntu:xenial -Tags: r2b3-core +Tags: ardent-core Architectures: amd64 -GitCommit: 100f733a1689fd853f0ea68a2fc0b542cb4bc673 -Directory: ros2/r2b3/ubuntu/xenial/r2b3-core +GitCommit: 83ba18815e9d30de2ba65224937289292ab3e402 +Directory: ros2/ardent/ubuntu/xenial/ardent-core -Tags: r2b3-ros1-bridge +Tags: ardent-basic Architectures: amd64 -GitCommit: 100f733a1689fd853f0ea68a2fc0b542cb4bc673 -Directory: ros2/r2b3/ubuntu/xenial/r2b3-ros1-bridge +GitCommit: 83ba18815e9d30de2ba65224937289292ab3e402 +Directory: ros2/ardent/ubuntu/xenial/ardent-basic + +Tags: ardent-full +Architectures: amd64 +GitCommit: 83ba18815e9d30de2ba65224937289292ab3e402 +Directory: ros2/ardent/ubuntu/xenial/ardent-full + +Tags: ardent-ros1-bridge +Architectures: amd64 +GitCommit: 83ba18815e9d30de2ba65224937289292ab3e402 +Directory: ros2/ardent/ubuntu/xenial/ardent-ros1-bridge From 48f5c86e96de27dc720278d0427b276fa376bda5 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Thu, 25 Jan 2018 00:13:04 -0800 Subject: [PATCH 5/5] [ros2] update travis to test ardent --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ff2d3ee9..4b91e1715 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ install: env: # ros2 - - HUB_REPO=ros2 HUB_RELEASE=r2b3 HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial + - HUB_REPO=ros2 HUB_RELEASE=ardent HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial # ros - HUB_REPO=ros HUB_RELEASE=lunar HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=zesty - HUB_REPO=ros HUB_RELEASE=lunar HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial