osrf · ruffsl · Jan 3, 2019 · Nov 16, 2018 · Nov 16, 2018 · Nov 16, 2018
diff --git a/README.md b/README.md
@@ -4,6 +4,14 @@ This repo hosts the Dockerfiles used to generate the official images for OSRF pr
 ##### Dockerfile CI [![Build Status](https://travis-ci.org/osrf/docker_images.svg?branch=master)](https://travis-ci.org/osrf/docker_images)
 
 ## Official Library
+### [ROS2 ![Docker Pulls](https://img.shields.io/docker/pulls/_/ros2.svg) ![Docker Stars](https://img.shields.io/docker/stars/_/ros2.svg)](https://registry.hub.docker.com/_/ros2/)
+[![Compare Images](https://images.microbadger.com/badges/image/library/ros2.svg)](https://microbadger.com/#/images/library/ros2)
+
+* amd64 [![Build Status](https://doi-janky.infosiftr.net/buildStatus/icon?job=multiarch/amd64/ros2)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ros2/)
+
+* arm64v8 [![Build Status](https://doi-janky.infosiftr.net/buildStatus/icon?job=multiarch/arm64v8/ros2)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ros2/)
+
+
 ### [ROS ![Docker Pulls](https://img.shields.io/docker/pulls/_/ros.svg) ![Docker Stars](https://img.shields.io/docker/stars/_/ros.svg)](https://registry.hub.docker.com/_/ros/)
 [![Compare Images](https://images.microbadger.com/badges/image/library/ros.svg)](https://microbadger.com/#/images/library/ros)
 
@@ -40,12 +48,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)
 

diff --git a/ros2/.config/Makefile.em b/ros2/.config/Makefile.em
@@ -10,19 +10,19 @@ help:
 	@echo ""
 
 build:
-	@docker build --tag=osrf/ros2:$release_name-ros-core			ros-core/.
-	@docker build --tag=osrf/ros2:$release_name-ros-base			ros-base/.
-	@docker build --tag=osrf/ros2:$release_name-desktop			desktop/.
-	@docker build --tag=osrf/ros2:$release_name-ros1-bridge			ros1-bridge/.
+	@docker build --tag=osrf/ros2:$release_name-ros-core-$os_code_name			ros-core/.
+	@docker build --tag=osrf/ros2:$release_name-ros-base-$os_code_name			ros-base/.
+	@docker build --tag=osrf/ros2:$release_name-desktop-$os_code_name			desktop/.
+	@docker build --tag=osrf/ros2:$release_name-ros1-bridge-$os_code_name			ros1-bridge/.
 
 pull:
-	@docker pull osrf/ros2:$release_name-ros-core
-	@docker pull osrf/ros2:$release_name-ros-base
-	@docker pull osrf/ros2:$release_name-desktop
-	@docker pull osrf/ros2:$release_name-ros1-bridge
+	@docker pull osrf/ros2:$release_name-ros-core-$os_code_name
+	@docker pull osrf/ros2:$release_name-ros-base-$os_code_name
+	@docker pull osrf/ros2:$release_name-desktop-$os_code_name
+	@docker pull osrf/ros2:$release_name-ros1-bridge-$os_code_name
 
 clean:
-	@docker rmi -f osrf/ros2:$release_name-ros-core
-	@docker rmi -f osrf/ros2:$release_name-ros-base
-	@docker rmi -f osrf/ros2:$release_name-desktop
-	@docker rmi -f osrf/ros2:$release_name-ros1-bridge
+	@docker rmi -f osrf/ros2:$release_name-ros-core-$os_code_name
+	@docker rmi -f osrf/ros2:$release_name-ros-base-$os_code_name
+	@docker rmi -f osrf/ros2:$release_name-desktop-$os_code_name
+	@docker rmi -f osrf/ros2:$release_name-ros1-bridge-$os_code_name
diff --git a/ros2/.config/platform.yaml.em b/ros2/.config/platform.yaml.em
@@ -10,4 +10,4 @@ platform:
     maintainer_name:
     arch: amd64
     type: distribution
-    version: false
+    version:
diff --git a/ros2/.hooks/post_push.em b/ros2/.hooks/post_push.em
@@ -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 @tags; do
+    docker tag $IMAGE_NAME ${repoName}:${tag}
+    docker push ${repoName}:${tag}
+done
diff --git a/ros2/ardent/ubuntu/xenial/Makefile b/ros2/ardent/ubuntu/xenial/Makefile
@@ -10,19 +10,19 @@ help:
 	@echo ""
 
 build:
-	@docker build --tag=osrf/ros2:ardent-ros-core			ros-core/.
-	@docker build --tag=osrf/ros2:ardent-ros-base			ros-base/.
-	@docker build --tag=osrf/ros2:ardent-desktop			desktop/.
-	@docker build --tag=osrf/ros2:ardent-ros1-bridge			ros1-bridge/.
+	@docker build --tag=osrf/ros2:ardent-ros-core-xenial			ros-core/.
+	@docker build --tag=osrf/ros2:ardent-ros-base-xenial			ros-base/.
+	@docker build --tag=osrf/ros2:ardent-desktop-xenial			desktop/.
+	@docker build --tag=osrf/ros2:ardent-ros1-bridge-xenial			ros1-bridge/.
 
 pull:
-	@docker pull osrf/ros2:ardent-ros-core
-	@docker pull osrf/ros2:ardent-ros-base
-	@docker pull osrf/ros2:ardent-desktop
-	@docker pull osrf/ros2:ardent-ros1-bridge
+	@docker pull osrf/ros2:ardent-ros-core-xenial
+	@docker pull osrf/ros2:ardent-ros-base-xenial
+	@docker pull osrf/ros2:ardent-desktop-xenial
+	@docker pull osrf/ros2:ardent-ros1-bridge-xenial
 
 clean:
-	@docker rmi -f osrf/ros2:ardent-ros-core
-	@docker rmi -f osrf/ros2:ardent-ros-base
-	@docker rmi -f osrf/ros2:ardent-desktop
-	@docker rmi -f osrf/ros2:ardent-ros1-bridge
+	@docker rmi -f osrf/ros2:ardent-ros-core-xenial
+	@docker rmi -f osrf/ros2:ardent-ros-base-xenial
+	@docker rmi -f osrf/ros2:ardent-desktop-xenial
+	@docker rmi -f osrf/ros2:ardent-ros1-bridge-xenial
diff --git a/ros2/ardent/ubuntu/xenial/desktop/Dockerfile b/ros2/ardent/ubuntu/xenial/desktop/Dockerfile
@@ -3,6 +3,6 @@
 FROM osrf/ros2:ardent-ros-base
 # install ros2 packages
 RUN apt-get update && apt-get install -y \
-    ros-ardent-desktop \
+    ros-ardent-desktop=0.4.0-1* \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/ros2/ardent/ubuntu/xenial/desktop/hooks/post_push b/ros2/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
diff --git a/ros2/ardent/ubuntu/xenial/platform.yaml b/ros2/ardent/ubuntu/xenial/platform.yaml
@@ -10,4 +10,4 @@ platform:
     maintainer_name:
     arch: amd64
     type: distribution
-    version: false
+    version:
diff --git a/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile b/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile
@@ -3,6 +3,6 @@
 FROM osrf/ros2:ardent-ros-core
 # install ros2 packages
 RUN apt-get update && apt-get install -y \
-    ros-ardent-ros-base \
+    ros-ardent-ros-base=0.4.0-1* \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile
@@ -10,27 +10,37 @@ RUN apt-get update && apt-get install -q -y \
     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 . /etc/os-release \
     && echo "deb http://repo.ros2.org/$ID/main `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
 
-ENV ROS_DISTRO ardent
+# 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 \
+    ros-ardent-ros-core=0.4.0-1* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup entrypoint

diff --git a/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile b/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile
@@ -12,8 +12,8 @@ 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* \
+    ros-ardent-turtlebot2-demo=0.4.1-0* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup entrypoint

diff --git a/ros2/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push b/ros2/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
diff --git a/ros2/bouncy/ubuntu/bionic/Makefile b/ros2/bouncy/ubuntu/bionic/Makefile
@@ -10,19 +10,19 @@ help:
 	@echo ""
 
 build:
-	@docker build --tag=osrf/ros2:bouncy-ros-core			ros-core/.
-	@docker build --tag=osrf/ros2:bouncy-ros-base			ros-base/.
-	@docker build --tag=osrf/ros2:bouncy-desktop			desktop/.
-	@docker build --tag=osrf/ros2:bouncy-ros1-bridge			ros1-bridge/.
+	@docker build --tag=osrf/ros2:bouncy-ros-core-bionic			ros-core/.
+	@docker build --tag=osrf/ros2:bouncy-ros-base-bionic			ros-base/.
+	@docker build --tag=osrf/ros2:bouncy-desktop-bionic			desktop/.
+	@docker build --tag=osrf/ros2:bouncy-ros1-bridge-bionic			ros1-bridge/.
 
 pull:
-	@docker pull osrf/ros2:bouncy-ros-core
-	@docker pull osrf/ros2:bouncy-ros-base
-	@docker pull osrf/ros2:bouncy-desktop
-	@docker pull osrf/ros2:bouncy-ros1-bridge
+	@docker pull osrf/ros2:bouncy-ros-core-bionic
+	@docker pull osrf/ros2:bouncy-ros-base-bionic
+	@docker pull osrf/ros2:bouncy-desktop-bionic
+	@docker pull osrf/ros2:bouncy-ros1-bridge-bionic
 
 clean:
-	@docker rmi -f osrf/ros2:bouncy-ros-core
-	@docker rmi -f osrf/ros2:bouncy-ros-base
-	@docker rmi -f osrf/ros2:bouncy-desktop
-	@docker rmi -f osrf/ros2:bouncy-ros1-bridge
+	@docker rmi -f osrf/ros2:bouncy-ros-core-bionic
+	@docker rmi -f osrf/ros2:bouncy-ros-base-bionic
+	@docker rmi -f osrf/ros2:bouncy-desktop-bionic
+	@docker rmi -f osrf/ros2:bouncy-ros1-bridge-bionic
diff --git a/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile b/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile
@@ -3,6 +3,6 @@
 FROM osrf/ros2:bouncy-ros-base
 # install ros2 packages
 RUN apt-get update && apt-get install -y \
-    ros-bouncy-desktop \
+    ros-bouncy-desktop=0.5.1-0* \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/ros2/bouncy/ubuntu/bionic/desktop/hooks/post_push b/ros2/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
diff --git a/ros2/bouncy/ubuntu/bionic/platform.yaml b/ros2/bouncy/ubuntu/bionic/platform.yaml
@@ -10,4 +10,4 @@ platform:
     maintainer_name:
     arch: amd64
     type: distribution
-    version: false
+    version:
diff --git a/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile
@@ -3,6 +3,6 @@
 FROM osrf/ros2:bouncy-ros-core
 # install ros2 packages
 RUN apt-get update && apt-get install -y \
-    ros-bouncy-ros-base \
+    ros-bouncy-ros-base=0.5.1-0* \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile
@@ -2,11 +2,11 @@
 # generated from docker_images/create_ros2_core_image.Dockerfile.em
 FROM ubuntu:bionic
 
+# setup timezone
 RUN echo 'Etc/UTC' > /etc/timezone && \
     ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
     apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*
 
-
 # install packages
 RUN apt-get update && apt-get install -q -y \
     dirmngr \
@@ -15,27 +15,37 @@ RUN apt-get update && apt-get install -q -y \
     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 . /etc/os-release \
     && echo "deb http://repo.ros2.org/$ID/main `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
 
-ENV ROS_DISTRO bouncy
+# 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 bouncy
 RUN apt-get update && apt-get install -y \
-    ros-bouncy-ros-core \
+    ros-bouncy-ros-core=0.5.1-0* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup entrypoint

diff --git a/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile
@@ -12,8 +12,8 @@ ENV ROS1_DISTRO melodic
 ENV ROS2_DISTRO bouncy
 # install ros2 packages
 RUN apt-get update && apt-get install -y \
-    ros-bouncy-ros1-bridge \
-    ros-bouncy-turtlebot2-demo \
+    ros-bouncy-ros1-bridge=0.5.1-0* \
+    ros-bouncy-turtlebot2-demo=0.5.1-0* \
     && rm -rf /var/lib/apt/lists/*
 
 # setup entrypoint

diff --git a/ros2/bouncy/ubuntu/bionic/ros1-bridge/hooks/post_push b/ros2/bouncy/ubuntu/bionic/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 bouncy-ros1-bridge; do
+    docker tag $IMAGE_NAME ${repoName}:${tag}
+    docker push ${repoName}:${tag}
+done
diff --git a/ros2/crystal/ubuntu/bionic/Makefile b/ros2/crystal/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=osrf/ros2:crystal-ros-core-bionic			ros-core/.
+	@docker build --tag=osrf/ros2:crystal-ros-base-bionic			ros-base/.
+	@docker build --tag=osrf/ros2:crystal-desktop-bionic			desktop/.
+	@docker build --tag=osrf/ros2:crystal-ros1-bridge-bionic			ros1-bridge/.
+
+pull:
+	@docker pull osrf/ros2:crystal-ros-core-bionic
+	@docker pull osrf/ros2:crystal-ros-base-bionic
+	@docker pull osrf/ros2:crystal-desktop-bionic
+	@docker pull osrf/ros2:crystal-ros1-bridge-bionic
+
+clean:
+	@docker rmi -f osrf/ros2:crystal-ros-core-bionic
+	@docker rmi -f osrf/ros2:crystal-ros-base-bionic
+	@docker rmi -f osrf/ros2:crystal-desktop-bionic
+	@docker rmi -f osrf/ros2:crystal-ros1-bridge-bionic