update library and generated files

osrf · Jan 23, 2018 · 3df1d15 · 3df1d15
1 parent f10f345
commit 3df1d15
Show file tree

Hide file tree

Showing 9 changed files with 168 additions and 14 deletions.
diff --git a/ros2/ardent/ubuntu/xenial/Makefile b/ros2/ardent/ubuntu/xenial/Makefile
@@ -11,12 +11,18 @@ help:
 
 build:
 	@docker build --tag=osrf/ros2:ardent-core			ardent-core/.
-	@docker build --tag=osrf/ros2:ardent-ros1-bridge	ardent-ros1-bridge/.
+	@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
@@ -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/ardent/ubuntu/xenial/ardent-basic/ros2_entrypoint.sh b/ros2/ardent/ubuntu/xenial/ardent-basic/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-core/Dockerfile b/ros2/ardent/ubuntu/xenial/ardent-core/Dockerfile
@@ -27,16 +27,11 @@ 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-demo-nodes-cpp \
-    ros-ardent-demo-nodes-py \
-    ros-ardent-ros2run \
-    ros-ardent-sros2 \
+    ros-ardent-rclcpp \
+    ros-ardent-rclpy \
     && rm -rf /var/lib/apt/lists/*
 
 # setup entrypoint

diff --git a/ros2/ardent/ubuntu/xenial/ardent-full/Dockerfile 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
@@ -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-ros1-bridge/Dockerfile b/ros2/ardent/ubuntu/xenial/ardent-ros1-bridge/Dockerfile
@@ -1,10 +1,11 @@
 # This is an auto generated Dockerfile for ros2:ardent-ros1-bridge
 # generated from docker_images/create_ros2_image.Dockerfile.em
-FROM osrf/ros2:ardent-core
+FROM osrf/ros2:ardent-full
 
 # install ros2 packages
 RUN apt-get update && apt-get install -y \
     ros-ardent-ros1-bridge \
+    ros-ardent-turtlebot2* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup entrypoint

diff --git a/ros2/ardent/ubuntu/xenial/images.yaml.em b/ros2/ardent/ubuntu/xenial/images.yaml.em
@@ -7,23 +7,81 @@ 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:
             - 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)-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
         template_packages:
             - docker_templates
         ros2_packages:
             - ros1-bridge
+            - turtlebot2*
diff --git a/ros2/ros2 b/ros2/ros2
@@ -8,12 +8,22 @@ GitRepo: https://github.com/osrf/docker_images.git
 # Distro: ubuntu:xenial
 
 Tags: ardent-core
-Architectures: amd64, arm64v8
-GitCommit: c9285620d0cbade3a9614644a618408468cbe916
+Architectures: amd64
+GitCommit: 83ba18815e9d30de2ba65224937289292ab3e402
 Directory: ros2/ardent/ubuntu/xenial/ardent-core
 
+Tags: ardent-basic
+Architectures: amd64
+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, arm64v8
-GitCommit: c9285620d0cbade3a9614644a618408468cbe916
+Architectures: amd64
+GitCommit: 83ba18815e9d30de2ba65224937289292ab3e402
 Directory: ros2/ardent/ubuntu/xenial/ardent-ros1-bridge