Split rmw and rmw-nonfree tags

but don't bother templating them just yet

Signed-off-by: ruffsl <roxfoxpox@gmail.com>

Author: ruffsl

ros2/nightly/Makefile

@@ -10,13 +10,16 @@ help:
 	@echo ""
 
 build:
-	@docker build --tag=ros2:nightly			nightly/.
-	@docker build --tag=ros2:nightly-rmw			nightly-rmw/.
+	@docker build --tag=ros2:nightly             nightly/.
+	@docker build --tag=ros2:nightly-rmw         nightly-rmw/.
+	@docker build --tag=ros2:nightly-rmw-nonfree nightly-rmw-nonfree/.
 
 pull:
 	@docker pull ros2:nightly
 	@docker pull ros2:nightly-rmw
+	@docker pull ros2:nightly-rmw-nonfree
 
 clean:
 	@docker rmi -f ros2:nightly
 	@docker rmi -f ros2:nightly-rmw
+	@docker rmi -f ros2:nightly-rmw-nonfree

ros2/nightly/images.yaml.em

@@ -32,13 +32,3 @@ images:
                 - libopensplice69
                 - rti-connext-dds-5.3.1
         ros2_binary_url: https://ci.ros2.org/view/packaging/job/packaging_linux/lastSuccessfulBuild/artifact/ws/ros2-package-linux-x86_64.tar.bz2
-    nightly-rmw:
-        base_image: osrf/ros2:nightly
-        maintainer_name: @(maintainer_name)
-        template_name: docker_images_ros2/nightly/create_ros_rmw_image.Dockerfile.em
-        template_packages:
-            - docker_templates
-        rosdep:
-            path: /opt/ros/$ROS_DISTRO/share
-            skip_keys:
-              - ""

ros2/nightly/nightly-rmw-nonfree/Dockerfile

@@ -0,0 +1,17 @@
+FROM osrf/ros2:nightly-rmw
+
+# install dependencies
+ENV RTI_NC_LICENSE_ACCEPTED=yes
+RUN . /opt/ros/$ROS_DISTRO/setup.sh \
+    && apt-get update \
+    && rosdep install -y \
+    --from-paths /opt/ros/$ROS_DISTRO/share \
+    --ignore-src \
+    --skip-keys " \
+      " \
+    && rm -rf /var/lib/apt/lists/*
+
+# setup RTI Connext DDS
+ENV NDDSHOME="/opt/rti.com/rti_connext_dds-5.3.1"
+ENV PATH="$NDDSHOME/bin":$PATH
+ENV LD_LIBRARY_PATH="$NDDSHOME/lib/x64Linux3gcc5.4.0":$LD_LIBRARY_PATH

ros2/nightly/nightly-rmw/Dockerfile

@@ -1,19 +1,11 @@
-# This is an auto generated Dockerfile for ros:nightly-rmw
-# generated from docker_images_ros2/nightly/create_ros_rmw_image.Dockerfile.em
 FROM osrf/ros2:nightly
 
 # install dependencies
-ENV RTI_NC_LICENSE_ACCEPTED=yes
 RUN . /opt/ros/$ROS_DISTRO/setup.sh \
     && apt-get update \
     && rosdep install -y \
     --from-paths /opt/ros/$ROS_DISTRO/share \
     --ignore-src \
     --skip-keys " \
-      " \
+      rti-connext-dds-5.3.1" \
     && rm -rf /var/lib/apt/lists/*
-
-# setup RTI Connext DDS
-ENV NDDSHOME="/opt/rti.com/rti_connext_dds-5.3.1"
-ENV PATH="$NDDSHOME/bin":$PATH
-ENV LD_LIBRARY_PATH="$NDDSHOME/lib/x64Linux3gcc5.4.0":$LD_LIBRARY_PATH