[ROS] Crystal

.travis.yml

@@ -11,8 +11,9 @@ 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
+  - HUB_REPO=ros   HUB_RELEASE=crystal  HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=bionic
+  - HUB_REPO=ros   HUB_RELEASE=bouncy   HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=bionic
+  - HUB_REPO=ros   HUB_RELEASE=ardent   HUB_OS_NAME=ubuntu HUB_OS_CODE_NAME=xenial
   # 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

README.md

@@ -40,12 +40,6 @@ This repo hosts the Dockerfiles used to generate the official images for OSRF pr
 * amd64 [![Docker Build Status](https://img.shields.io/docker/build/osrf/gazebo.svg)](https://hub.docker.com/r/osrf/gazebo/builds/)
 
 
-### [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/)
-[![Compare Images](https://images.microbadger.com/badges/image/osrf/sros.svg)](https://microbadger.com/#/images/osrf/sros)
-
-* amd64 [![Docker Build Status](https://img.shields.io/docker/build/osrf/sros.svg)](https://hub.docker.com/r/osrf/sros/builds/)
-
-
 ### [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/)
 [![Compare Images](https://images.microbadger.com/badges/image/osrf/ros_legacy.svg)](https://microbadger.com/#/images/osrf/ros_legacy)
 

ros/.config/ros2/Makefile.em

@@ -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=ros:$release_name-ros-core-$os_code_name			ros-core/.
+	@docker build --tag=ros:$release_name-ros-base-$os_code_name			ros-base/.
+	# @docker build --tag=osrf/ros:$release_name-desktop-$os_code_name			desktop/.
+	# @docker build --tag=osrf/ros:$release_name-ros1-bridge-$os_code_name			ros1-bridge/.
+
+pull:
+	@docker pull ros:$release_name-ros-core-$os_code_name
+	@docker pull ros:$release_name-ros-base-$os_code_name
+	# @docker pull osrf/ros:$release_name-desktop-$os_code_name
+	# @docker pull osrf/ros:$release_name-ros1-bridge-$os_code_name
+
+clean:
+	@docker rmi -f ros:$release_name-ros-core-$os_code_name
+	@docker rmi -f ros:$release_name-ros-base-$os_code_name
+	# @docker rmi -f osrf/ros:$release_name-desktop-$os_code_name
+	# @docker rmi -f osrf/ros:$release_name-ros1-bridge-$os_code_name

ros2/ardent/ubuntu/xenial/images.yaml.em → ros/.config/ros2/images.yaml.em

@@ -5,37 +5,36 @@ images:
     ros-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_name: docker_images_ros2/create_ros_core_image.Dockerfile.em
+        entrypoint_name: docker_images_ros2/ros_entrypoint.sh
         pip3_install:
             - argcomplete
         template_packages:
             - docker_templates
         ros2_packages:
             - ros-core
     ros-base:
-        base_image: osrf/@(user_name):@(ros2distro_name)-ros-core
+        base_image: @(user_name):@(ros2distro_name)-ros-core-@(os_code_name)
         maintainer_name: @(maintainer_name)
-        template_name: docker_images/create_ros2_image.Dockerfile.em
+        template_name: docker_images_ros2/create_ros_image.Dockerfile.em
         template_packages:
             - docker_templates
         ros2_packages:
             - ros-base
     desktop:
-        base_image: osrf/@(user_name):@(ros2distro_name)-ros-base
+        base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
         maintainer_name: @(maintainer_name)
-        template_name: docker_images/create_ros2_image.Dockerfile.em
+        template_name: docker_images_ros2/create_ros_image.Dockerfile.em
         template_packages:
             - docker_templates
         ros2_packages:
             - desktop
     ros1-bridge:
-        base_image: osrf/@(user_name):@(ros2distro_name)-desktop
+        base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
         maintainer_name: @(maintainer_name)
-        template_name: docker_images/create_ros2_ros1_bridge_image.Dockerfile.em
-        entrypoint_name: docker_images/ros1_bridge_entrypoint.sh
+        template_name: docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em
+        entrypoint_name: docker_images_ros2/ros1_bridge/ros_entrypoint.sh
         template_packages:
             - docker_templates
         ros2_packages:
             - ros1-bridge
-            - turtlebot2-demo

ros2/.config/platform.yaml.em → ros/.config/ros2/platform.yaml.em

@@ -6,8 +6,8 @@ platform:
     os_code_name: $os_code_name
     rosdistro_name: $rosdistro_name
     ros2distro_name: $release_name
-    user_name: ros2
+    user_name: ros
     maintainer_name:
     arch: amd64
     type: distribution
-    version: false
+    version:

ros/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=ros:ardent-ros-core-xenial			ros-core/.
+	@docker build --tag=ros:ardent-ros-base-xenial			ros-base/.
+	# @docker build --tag=osrf/ros:ardent-desktop-xenial			desktop/.
+	# @docker build --tag=osrf/ros:ardent-ros1-bridge-xenial			ros1-bridge/.
+
+pull:
+	@docker pull ros:ardent-ros-core-xenial
+	@docker pull ros:ardent-ros-base-xenial
+	# @docker pull osrf/ros:ardent-desktop-xenial
+	# @docker pull osrf/ros:ardent-ros1-bridge-xenial
+
+clean:
+	@docker rmi -f ros:ardent-ros-core-xenial
+	@docker rmi -f ros:ardent-ros-base-xenial
+	# @docker rmi -f osrf/ros:ardent-desktop-xenial
+	# @docker rmi -f osrf/ros:ardent-ros1-bridge-xenial

ros/ardent/ubuntu/xenial/desktop/Dockerfile

@@ -0,0 +1,8 @@
+# This is an auto generated Dockerfile for ros:desktop
+# generated from docker_images_ros2/create_ros_image.Dockerfile.em
+FROM ros:ardent-ros-base-xenial
+# install ros2 packages
+RUN apt-get update && apt-get install -y \
+    ros-ardent-desktop=0.4.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+

ros/ardent/ubuntu/xenial/desktop/hooks/post_push

@@ -0,0 +1,14 @@
+#!/bin/bash
+# http://windsock.io/automated-docker-image-builds-with-multiple-tags/
+
+set -e
+
+# Parse image name for repo name
+tagStart=$(expr index "$IMAGE_NAME" :)
+repoName=${IMAGE_NAME:0:tagStart-1}
+
+# Tag and push image for each additional tag
+for tag in ardent-desktop; do
+    docker tag $IMAGE_NAME ${repoName}:${tag}
+    docker push ${repoName}:${tag}
+done

ros2/.config/images.yaml.em → ros/ardent/ubuntu/xenial/images.yaml.em

@@ -5,37 +5,36 @@ images:
     ros-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_name: docker_images_ros2/create_ros_core_image.Dockerfile.em
+        entrypoint_name: docker_images_ros2/ros_entrypoint.sh
         pip3_install:
             - argcomplete
         template_packages:
             - docker_templates
         ros2_packages:
             - ros-core
     ros-base:
-        base_image: osrf/@(user_name):@(ros2distro_name)-ros-core
+        base_image: @(user_name):@(ros2distro_name)-ros-core-@(os_code_name)
         maintainer_name: @(maintainer_name)
-        template_name: docker_images/create_ros2_image.Dockerfile.em
+        template_name: docker_images_ros2/create_ros_image.Dockerfile.em
         template_packages:
             - docker_templates
         ros2_packages:
             - ros-base
     desktop:
-        base_image: osrf/@(user_name):@(ros2distro_name)-ros-base
+        base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
         maintainer_name: @(maintainer_name)
-        template_name: docker_images/create_ros2_image.Dockerfile.em
+        template_name: docker_images_ros2/create_ros_image.Dockerfile.em
         template_packages:
             - docker_templates
         ros2_packages:
             - desktop
     ros1-bridge:
-        base_image: osrf/@(user_name):@(ros2distro_name)-desktop
+        base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
         maintainer_name: @(maintainer_name)
-        template_name: docker_images/create_ros2_ros1_bridge_image.Dockerfile.em
-        entrypoint_name: docker_images/ros1_bridge_entrypoint.sh
+        template_name: docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em
+        entrypoint_name: docker_images_ros2/ros1_bridge/ros_entrypoint.sh
         template_packages:
             - docker_templates
         ros2_packages:
             - ros1-bridge
-            - turtlebot2-demo

ros2/ardent/ubuntu/xenial/platform.yaml → ros/ardent/ubuntu/xenial/platform.yaml

@@ -6,8 +6,8 @@ platform:
     os_code_name: xenial
     rosdistro_name: kinetic
     ros2distro_name: ardent
-    user_name: ros2
+    user_name: ros
     maintainer_name:
     arch: amd64
     type: distribution
-    version: false
+    version:

ros/ardent/ubuntu/xenial/ros-base/Dockerfile

@@ -0,0 +1,8 @@
+# This is an auto generated Dockerfile for ros:ros-base
+# generated from docker_images_ros2/create_ros_image.Dockerfile.em
+FROM ros:ardent-ros-core-xenial
+# install ros2 packages
+RUN apt-get update && apt-get install -y \
+    ros-ardent-ros-base=0.4.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+

ros/ardent/ubuntu/xenial/ros-core/Dockerfile

@@ -0,0 +1,49 @@
+# This is an auto generated Dockerfile for ros:ros-core
+# generated from docker_images_ros2/create_ros_core_image.Dockerfile.em
+FROM ubuntu:xenial
+
+# install packages
+RUN apt-get update && apt-get install -q -y \
+    dirmngr \
+    gnupg2 \
+    lsb-release \
+    python3-pip \
+    && rm -rf /var/lib/apt/lists/*
+
+# setup ros2 keys
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
+
+# setup sources.list
+RUN echo "deb http://packages.ros.org/ros2/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros2-latest.list
+
+# install bootstrap tools
+RUN apt-get update && apt-get install --no-install-recommends -y \
+    python3-rosdep \
+    python3-rosinstall \
+    python3-vcstools \
+    && rm -rf /var/lib/apt/lists/*
+
+# setup environment
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
+# bootstrap rosdep
+ENV ROSDISTRO_INDEX_URL https://raw.githubusercontent.com/ros2/rosdistro/ros2/index.yaml
+RUN rosdep init \
+    && rosdep update
+
+# install python packages
+RUN pip3 install -U \
+    argcomplete
+
+# install ros2 packages
+ENV ROS_DISTRO ardent
+RUN apt-get update && apt-get install -y \
+    ros-ardent-ros-core=0.4.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+
+# setup entrypoint
+COPY ./ros_entrypoint.sh /
+
+ENTRYPOINT ["/ros_entrypoint.sh"]
+CMD ["bash"]

ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile → ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile

@@ -1,6 +1,6 @@
-# This is an auto generated Dockerfile for ros2:ros1-bridge
-# generated from docker_images/create_ros2_ros1_bridge_image.Dockerfile.em
-FROM osrf/ros2:ardent-desktop
+# This is an auto generated Dockerfile for ros:ros1-bridge
+# generated from docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em
+FROM ros:ardent-ros-base-xenial
 
 # setup keys
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
@@ -12,12 +12,11 @@ ENV ROS1_DISTRO kinetic
 ENV ROS2_DISTRO ardent
 # install ros2 packages
 RUN apt-get update && apt-get install -y \
-    ros-ardent-ros1-bridge \
-    ros-ardent-turtlebot2-demo \
+    ros-ardent-ros1-bridge=0.4.0-0* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup entrypoint
-COPY ./ros1_bridge_entrypoint.sh /
+COPY ./ros_entrypoint.sh /
 
-ENTRYPOINT ["/ros1_bridge_entrypoint.sh"]
+ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["bash"]

ros/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push

@@ -0,0 +1,14 @@
+#!/bin/bash
+# http://windsock.io/automated-docker-image-builds-with-multiple-tags/
+
+set -e
+
+# Parse image name for repo name
+tagStart=$(expr index "$IMAGE_NAME" :)
+repoName=${IMAGE_NAME:0:tagStart-1}
+
+# Tag and push image for each additional tag
+for tag in ardent-ros1-bridge; do
+    docker tag $IMAGE_NAME ${repoName}:${tag}
+    docker push ${repoName}:${tag}
+done

ros/bouncy/ubuntu/bionic/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=ros:bouncy-ros-core-bionic			ros-core/.
+	@docker build --tag=ros:bouncy-ros-base-bionic			ros-base/.
+	# @docker build --tag=osrf/ros:bouncy-desktop-bionic			desktop/.
+	# @docker build --tag=osrf/ros:bouncy-ros1-bridge-bionic			ros1-bridge/.
+
+pull:
+	@docker pull ros:bouncy-ros-core-bionic
+	@docker pull ros:bouncy-ros-base-bionic
+	# @docker pull osrf/ros:bouncy-desktop-bionic
+	# @docker pull osrf/ros:bouncy-ros1-bridge-bionic
+
+clean:
+	@docker rmi -f ros:bouncy-ros-core-bionic
+	@docker rmi -f ros:bouncy-ros-base-bionic
+	# @docker rmi -f osrf/ros:bouncy-desktop-bionic
+	# @docker rmi -f osrf/ros:bouncy-ros1-bridge-bionic

ros/bouncy/ubuntu/bionic/desktop/Dockerfile

@@ -0,0 +1,8 @@
+# This is an auto generated Dockerfile for ros:desktop
+# generated from docker_images_ros2/create_ros_image.Dockerfile.em
+FROM ros:bouncy-ros-base-bionic
+# install ros2 packages
+RUN apt-get update && apt-get install -y \
+    ros-bouncy-desktop=0.5.1-0* \
+    && rm -rf /var/lib/apt/lists/*
+

ros/bouncy/ubuntu/bionic/desktop/hooks/post_push

@@ -0,0 +1,14 @@
+#!/bin/bash
+# http://windsock.io/automated-docker-image-builds-with-multiple-tags/
+
+set -e
+
+# Parse image name for repo name
+tagStart=$(expr index "$IMAGE_NAME" :)
+repoName=${IMAGE_NAME:0:tagStart-1}
+
+# Tag and push image for each additional tag
+for tag in bouncy-desktop; do
+    docker tag $IMAGE_NAME ${repoName}:${tag}
+    docker push ${repoName}:${tag}
+done