From a2a3be404ee301d26d3d7227fb6bb8b5a012accd Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 15 Nov 2018 22:14:48 -0800 Subject: [PATCH 01/35] Template over os_code_name to facilitate multi os --- ros2/.config/Makefile.em | 24 ++++++++++++------------ ros2/ardent/ubuntu/xenial/Makefile | 24 ++++++++++++------------ ros2/bouncy/ubuntu/bionic/Makefile | 24 ++++++++++++------------ ros2/manifest.yaml | 8 ++++++++ 4 files changed, 44 insertions(+), 36 deletions(-) diff --git a/ros2/.config/Makefile.em b/ros2/.config/Makefile.em index 2eceb3ab8..1d70f7dc7 100644 --- 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/ardent/ubuntu/xenial/Makefile b/ros2/ardent/ubuntu/xenial/Makefile index b2ba433fb..36e85fe78 100644 --- 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/bouncy/ubuntu/bionic/Makefile b/ros2/bouncy/ubuntu/bionic/Makefile index 487026723..4944569cd 100644 --- 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/manifest.yaml b/ros2/manifest.yaml index 945d47cd7..4e701c8eb 100644 --- a/ros2/manifest.yaml +++ b/ros2/manifest.yaml @@ -28,15 +28,19 @@ release_names: ros-core: aliases: - "$release_name-ros-core" + - "$release_name-ros-core-$os_code_name" ros-base: aliases: - "$release_name-ros-base" + - "$release_name-ros-base-$os_code_name" desktop: aliases: - "$release_name-desktop" + - "$release_name-desktop-$os_code_name" ros1-bridge: aliases: - "$release_name-ros1-bridge" + - "$release_name-ros1-bridge-$os_code_name" bouncy: eol: 2019-07 os_names: @@ -51,15 +55,19 @@ release_names: ros-core: aliases: - "$release_name-ros-core" + - "$release_name-ros-core-$os_code_name" ros-base: aliases: - "$release_name-ros-base" + - "$release_name-ros-base-$os_code_name" desktop: aliases: - "$release_name-desktop" + - "$release_name-desktop-$os_code_name" ros1-bridge: aliases: - "$release_name-ros1-bridge" + - "$release_name-ros1-bridge-$os_code_name" meta: maintainers: From 0bf8042518334998358a9bedf898c48f7ad0421c Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 15 Nov 2018 22:15:21 -0800 Subject: [PATCH 02/35] Add support for arm64v8 --- ros2/manifest.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ros2/manifest.yaml b/ros2/manifest.yaml index 4e701c8eb..c09e717ba 100644 --- a/ros2/manifest.yaml +++ b/ros2/manifest.yaml @@ -24,6 +24,7 @@ release_names: <<: *DEFAULT archs: - amd64 + - arm64v8 tag_names: ros-core: aliases: @@ -51,6 +52,7 @@ release_names: <<: *DEFAULT archs: - amd64 + - arm64v8 tag_names: ros-core: aliases: From 70c14bd3192018501fb557060a949692ccc8a8cf Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 15 Nov 2018 22:16:54 -0800 Subject: [PATCH 03/35] Update manifest for arm64v8 --- ros2/ros2 | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/ros2/ros2 b/ros2/ros2 index 3d2128f3a..281bbcc16 100644 --- a/ros2/ros2 +++ b/ros2/ros2 @@ -7,24 +7,24 @@ GitRepo: https://github.com/osrf/docker_images.git ######################################## # Distro: ubuntu:xenial -Tags: ardent-ros-core -Architectures: amd64 -GitCommit: e1efe9d2d35af87c9135801a9a3d64fd2e7e16d3 +Tags: ardent-ros-core, ardent-ros-core-xenial +Architectures: amd64, arm64v8 +GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd Directory: ros2/ardent/ubuntu/xenial/ros-core -Tags: ardent-ros-base -Architectures: amd64 -GitCommit: e1efe9d2d35af87c9135801a9a3d64fd2e7e16d3 +Tags: ardent-ros-base, ardent-ros-base-xenial +Architectures: amd64, arm64v8 +GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd Directory: ros2/ardent/ubuntu/xenial/ros-base -Tags: ardent-desktop -Architectures: amd64 -GitCommit: e1efe9d2d35af87c9135801a9a3d64fd2e7e16d3 +Tags: ardent-desktop, ardent-desktop-xenial +Architectures: amd64, arm64v8 +GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd Directory: ros2/ardent/ubuntu/xenial/desktop -Tags: ardent-ros1-bridge -Architectures: amd64 -GitCommit: e1efe9d2d35af87c9135801a9a3d64fd2e7e16d3 +Tags: ardent-ros1-bridge, ardent-ros1-bridge-xenial +Architectures: amd64, arm64v8 +GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd Directory: ros2/ardent/ubuntu/xenial/ros1-bridge @@ -34,23 +34,23 @@ Directory: ros2/ardent/ubuntu/xenial/ros1-bridge ######################################## # Distro: ubuntu:bionic -Tags: bouncy-ros-core -Architectures: amd64 -GitCommit: e1efe9d2d35af87c9135801a9a3d64fd2e7e16d3 +Tags: bouncy-ros-core, bouncy-ros-core-bionic +Architectures: amd64, arm64v8 +GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd Directory: ros2/bouncy/ubuntu/bionic/ros-core -Tags: bouncy-ros-base -Architectures: amd64 -GitCommit: e1efe9d2d35af87c9135801a9a3d64fd2e7e16d3 +Tags: bouncy-ros-base, bouncy-ros-base-bionic +Architectures: amd64, arm64v8 +GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd Directory: ros2/bouncy/ubuntu/bionic/ros-base -Tags: bouncy-desktop -Architectures: amd64 -GitCommit: e1efe9d2d35af87c9135801a9a3d64fd2e7e16d3 +Tags: bouncy-desktop, bouncy-desktop-bionic +Architectures: amd64, arm64v8 +GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd Directory: ros2/bouncy/ubuntu/bionic/desktop -Tags: bouncy-ros1-bridge -Architectures: amd64 -GitCommit: e1efe9d2d35af87c9135801a9a3d64fd2e7e16d3 +Tags: bouncy-ros1-bridge, bouncy-ros1-bridge-bionic +Architectures: amd64, arm64v8 +GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd Directory: ros2/bouncy/ubuntu/bionic/ros1-bridge From 14af668aa6f40eea2dab6f10037c2320d44df7b0 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 15 Nov 2018 22:27:30 -0800 Subject: [PATCH 04/35] Enable version pinning --- ros2/.config/platform.yaml.em | 2 +- ros2/ardent/ubuntu/xenial/desktop/Dockerfile | 2 +- ros2/ardent/ubuntu/xenial/platform.yaml | 2 +- ros2/ardent/ubuntu/xenial/ros-base/Dockerfile | 2 +- ros2/ardent/ubuntu/xenial/ros-core/Dockerfile | 2 +- ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile | 4 ++-- ros2/bouncy/ubuntu/bionic/desktop/Dockerfile | 2 +- ros2/bouncy/ubuntu/bionic/platform.yaml | 2 +- ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile | 2 +- ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile | 2 +- ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ros2/.config/platform.yaml.em b/ros2/.config/platform.yaml.em index ac864d249..62a158130 100644 --- 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/ardent/ubuntu/xenial/desktop/Dockerfile b/ros2/ardent/ubuntu/xenial/desktop/Dockerfile index bc9fcf0dd..d916edea2 100644 --- 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/platform.yaml b/ros2/ardent/ubuntu/xenial/platform.yaml index 0ca7df810..2bb1f9204 100644 --- 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 index d62443ead..cc935916f 100644 --- 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 index 78b665ad3..440d65949 100644 --- a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile @@ -30,7 +30,7 @@ RUN pip3 install -U \ # install ros2 packages 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 index 4b0f76799..df21872c6 100644 --- 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/bouncy/ubuntu/bionic/desktop/Dockerfile b/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile index 3749ab2c2..a442157a7 100644 --- 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/platform.yaml b/ros2/bouncy/ubuntu/bionic/platform.yaml index cc41c3b02..967954a9e 100644 --- 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 index b422655a4..26b43ca28 100644 --- 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 index dd00090c7..e1201e889 100644 --- a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile @@ -35,7 +35,7 @@ RUN pip3 install -U \ # install ros2 packages 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 index 9e910f24a..bbcb79a4c 100644 --- 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 From a78adf272d2609448c529599f11f681e8d27dd70 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 15 Nov 2018 22:36:30 -0800 Subject: [PATCH 05/35] Add hooks --- ros2/.hooks/post_push.em | 14 ++++++++++++++ ros2/ardent/ubuntu/xenial/desktop/hooks/post_push | 14 ++++++++++++++ .../ubuntu/xenial/ros1-bridge/hooks/post_push | 14 ++++++++++++++ ros2/bouncy/ubuntu/bionic/desktop/hooks/post_push | 14 ++++++++++++++ .../ubuntu/bionic/ros1-bridge/hooks/post_push | 14 ++++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 ros2/.hooks/post_push.em create mode 100755 ros2/ardent/ubuntu/xenial/desktop/hooks/post_push create mode 100755 ros2/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push create mode 100755 ros2/bouncy/ubuntu/bionic/desktop/hooks/post_push create mode 100755 ros2/bouncy/ubuntu/bionic/ros1-bridge/hooks/post_push diff --git a/ros2/.hooks/post_push.em b/ros2/.hooks/post_push.em new file mode 100644 index 000000000..82129168c --- /dev/null +++ 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/desktop/hooks/post_push b/ros2/ardent/ubuntu/xenial/desktop/hooks/post_push new file mode 100755 index 000000000..1d20643b5 --- /dev/null +++ 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/ros1-bridge/hooks/post_push b/ros2/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push new file mode 100755 index 000000000..713e9045e --- /dev/null +++ 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/desktop/hooks/post_push b/ros2/bouncy/ubuntu/bionic/desktop/hooks/post_push new file mode 100755 index 000000000..7b97aec3a --- /dev/null +++ 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/ros1-bridge/hooks/post_push b/ros2/bouncy/ubuntu/bionic/ros1-bridge/hooks/post_push new file mode 100755 index 000000000..088eb244d --- /dev/null +++ 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 From e7685ee199a9e44df62a6b5fb7dfec2619568261 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 15 Nov 2018 22:37:21 -0800 Subject: [PATCH 06/35] Update manifest --- ros2/manifest.yaml | 24 ++++++++++++++++++++++++ ros2/ros2 | 16 ++++++++-------- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/ros2/manifest.yaml b/ros2/manifest.yaml index c09e717ba..5f2c82f63 100644 --- a/ros2/manifest.yaml +++ b/ros2/manifest.yaml @@ -78,3 +78,27 @@ meta: template_packages: - docker_templates repo_url: https://github.com/osrf/docker_images.git + + +hacks: + + ardent: + os_names: + ubuntu: + os_code_names: + xenial: + tag_names: + desktop: + <<: *DEFAULT_HOOKS + ros1-bridge: + <<: *DEFAULT_HOOKS + bouncy: + os_names: + ubuntu: + os_code_names: + bionic: + tag_names: + desktop: + <<: *DEFAULT_HOOKS + ros1-bridge: + <<: *DEFAULT_HOOKS diff --git a/ros2/ros2 b/ros2/ros2 index 281bbcc16..ded87321b 100644 --- a/ros2/ros2 +++ b/ros2/ros2 @@ -9,22 +9,22 @@ GitRepo: https://github.com/osrf/docker_images.git Tags: ardent-ros-core, ardent-ros-core-xenial Architectures: amd64, arm64v8 -GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd +GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 Directory: ros2/ardent/ubuntu/xenial/ros-core Tags: ardent-ros-base, ardent-ros-base-xenial Architectures: amd64, arm64v8 -GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd +GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 Directory: ros2/ardent/ubuntu/xenial/ros-base Tags: ardent-desktop, ardent-desktop-xenial Architectures: amd64, arm64v8 -GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd +GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 Directory: ros2/ardent/ubuntu/xenial/desktop Tags: ardent-ros1-bridge, ardent-ros1-bridge-xenial Architectures: amd64, arm64v8 -GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd +GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 Directory: ros2/ardent/ubuntu/xenial/ros1-bridge @@ -36,21 +36,21 @@ Directory: ros2/ardent/ubuntu/xenial/ros1-bridge Tags: bouncy-ros-core, bouncy-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd +GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 Directory: ros2/bouncy/ubuntu/bionic/ros-core Tags: bouncy-ros-base, bouncy-ros-base-bionic Architectures: amd64, arm64v8 -GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd +GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 Directory: ros2/bouncy/ubuntu/bionic/ros-base Tags: bouncy-desktop, bouncy-desktop-bionic Architectures: amd64, arm64v8 -GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd +GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 Directory: ros2/bouncy/ubuntu/bionic/desktop Tags: bouncy-ros1-bridge, bouncy-ros1-bridge-bionic Architectures: amd64, arm64v8 -GitCommit: a2a3be404ee301d26d3d7227fb6bb8b5a012accd +GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 Directory: ros2/bouncy/ubuntu/bionic/ros1-bridge From a1ca2a9e77fc197896ec17384fd05a1340a3d31b Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 15 Nov 2018 22:45:34 -0800 Subject: [PATCH 07/35] Add preliminary files for ros2 crystal --- ros2/crystal/ubuntu/bionic/Makefile | 28 ++++++++++++ ros2/crystal/ubuntu/bionic/desktop/Dockerfile | 8 ++++ .../ubuntu/bionic/desktop/hooks/post_push | 14 ++++++ ros2/crystal/ubuntu/bionic/images.yaml.em | 41 +++++++++++++++++ ros2/crystal/ubuntu/bionic/platform.yaml | 13 ++++++ .../crystal/ubuntu/bionic/ros-base/Dockerfile | 8 ++++ .../crystal/ubuntu/bionic/ros-core/Dockerfile | 45 +++++++++++++++++++ .../ubuntu/bionic/ros-core/ros2_entrypoint.sh | 6 +++ .../ubuntu/bionic/ros1-bridge/Dockerfile | 23 ++++++++++ .../ubuntu/bionic/ros1-bridge/hooks/post_push | 14 ++++++ .../ros1-bridge/ros1_bridge_entrypoint.sh | 17 +++++++ ros2/manifest.yaml | 38 ++++++++++++++++ 12 files changed, 255 insertions(+) create mode 100644 ros2/crystal/ubuntu/bionic/Makefile create mode 100644 ros2/crystal/ubuntu/bionic/desktop/Dockerfile create mode 100755 ros2/crystal/ubuntu/bionic/desktop/hooks/post_push create mode 100644 ros2/crystal/ubuntu/bionic/images.yaml.em create mode 100644 ros2/crystal/ubuntu/bionic/platform.yaml create mode 100644 ros2/crystal/ubuntu/bionic/ros-base/Dockerfile create mode 100644 ros2/crystal/ubuntu/bionic/ros-core/Dockerfile create mode 100755 ros2/crystal/ubuntu/bionic/ros-core/ros2_entrypoint.sh create mode 100644 ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile create mode 100755 ros2/crystal/ubuntu/bionic/ros1-bridge/hooks/post_push create mode 100755 ros2/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh diff --git a/ros2/crystal/ubuntu/bionic/Makefile b/ros2/crystal/ubuntu/bionic/Makefile new file mode 100644 index 000000000..eb0496cad --- /dev/null +++ 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 diff --git a/ros2/crystal/ubuntu/bionic/desktop/Dockerfile b/ros2/crystal/ubuntu/bionic/desktop/Dockerfile new file mode 100644 index 000000000..b37a77c1a --- /dev/null +++ b/ros2/crystal/ubuntu/bionic/desktop/Dockerfile @@ -0,0 +1,8 @@ +# This is an auto generated Dockerfile for ros2:desktop +# generated from docker_images/create_ros2_image.Dockerfile.em +FROM osrf/ros2:crystal-ros-base +# install ros2 packages +RUN apt-get update && apt-get install -y \ + ros-crystal-desktop \ + && rm -rf /var/lib/apt/lists/* + diff --git a/ros2/crystal/ubuntu/bionic/desktop/hooks/post_push b/ros2/crystal/ubuntu/bionic/desktop/hooks/post_push new file mode 100755 index 000000000..c05af9bd3 --- /dev/null +++ b/ros2/crystal/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 crystal-desktop; do + docker tag $IMAGE_NAME ${repoName}:${tag} + docker push ${repoName}:${tag} +done diff --git a/ros2/crystal/ubuntu/bionic/images.yaml.em b/ros2/crystal/ubuntu/bionic/images.yaml.em new file mode 100644 index 000000000..3b3664385 --- /dev/null +++ b/ros2/crystal/ubuntu/bionic/images.yaml.em @@ -0,0 +1,41 @@ +%YAML 1.1 +# ROS2 Dockerfile database +--- +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 + pip3_install: + - argcomplete + template_packages: + - docker_templates + ros2_packages: + - ros-core + ros-base: + base_image: osrf/@(user_name):@(ros2distro_name)-ros-core + maintainer_name: @(maintainer_name) + template_name: docker_images/create_ros2_image.Dockerfile.em + template_packages: + - docker_templates + ros2_packages: + - ros-base + desktop: + base_image: osrf/@(user_name):@(ros2distro_name)-ros-base + maintainer_name: @(maintainer_name) + template_name: docker_images/create_ros2_image.Dockerfile.em + template_packages: + - docker_templates + ros2_packages: + - desktop + ros1-bridge: + base_image: osrf/@(user_name):@(ros2distro_name)-desktop + maintainer_name: @(maintainer_name) + template_name: docker_images/create_ros2_ros1_bridge_image.Dockerfile.em + entrypoint_name: docker_images/ros1_bridge_entrypoint.sh + template_packages: + - docker_templates + ros2_packages: + - ros1-bridge + - turtlebot2-demo diff --git a/ros2/crystal/ubuntu/bionic/platform.yaml b/ros2/crystal/ubuntu/bionic/platform.yaml new file mode 100644 index 000000000..182fd3ae7 --- /dev/null +++ b/ros2/crystal/ubuntu/bionic/platform.yaml @@ -0,0 +1,13 @@ +%YAML 1.1 +# ROS2 Dockerfile database +--- +platform: + os_name: ubuntu + os_code_name: bionic + rosdistro_name: melodic + ros2distro_name: crystal + user_name: ros2 + maintainer_name: + arch: amd64 + type: distribution + version: diff --git a/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile new file mode 100644 index 000000000..f51b2cfa6 --- /dev/null +++ b/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile @@ -0,0 +1,8 @@ +# This is an auto generated Dockerfile for ros2:ros-base +# generated from docker_images/create_ros2_image.Dockerfile.em +FROM osrf/ros2:crystal-ros-core +# install ros2 packages +RUN apt-get update && apt-get install -y \ + ros-crystal-ros-base \ + && rm -rf /var/lib/apt/lists/* + diff --git a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile new file mode 100644 index 000000000..b215078ab --- /dev/null +++ b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile @@ -0,0 +1,45 @@ +# This is an auto generated Dockerfile for ros2:ros-core +# generated from docker_images/create_ros2_core_image.Dockerfile.em +FROM ubuntu:bionic + +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 \ + 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 . /etc/os-release \ + && echo "deb http://repo.ros2.org/$ID/main `lsb_release -sc` main" > /etc/apt/sources.list.d/ros2-latest.list + +# setup environment +ENV LANG C.UTF-8 +ENV LC_ALL C.UTF-8 + +ENV ROS_DISTRO crystal + +# install python packages +RUN pip3 install -U \ + argcomplete + +# install ros2 packages +RUN apt-get update && apt-get install -y \ + ros-crystal-ros-core \ + && rm -rf /var/lib/apt/lists/* + +# setup entrypoint +COPY ./ros2_entrypoint.sh / + +ENTRYPOINT ["/ros2_entrypoint.sh"] +CMD ["bash"] diff --git a/ros2/crystal/ubuntu/bionic/ros-core/ros2_entrypoint.sh b/ros2/crystal/ubuntu/bionic/ros-core/ros2_entrypoint.sh new file mode 100755 index 000000000..80f3ce3ef --- /dev/null +++ b/ros2/crystal/ubuntu/bionic/ros-core/ros2_entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e + +# setup ros2 environment +source "/opt/ros/$ROS_DISTRO/setup.bash" +exec "$@" diff --git a/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile b/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile new file mode 100644 index 000000000..51c5cf4e6 --- /dev/null +++ b/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile @@ -0,0 +1,23 @@ +# This is an auto generated Dockerfile for ros2:ros1-bridge +# generated from docker_images/create_ros2_ros1_bridge_image.Dockerfile.em +FROM osrf/ros2:crystal-desktop + +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 + +# setup sources.list +RUN echo "deb http://packages.ros.org/ros/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros-latest.list + +ENV ROS1_DISTRO melodic +ENV ROS2_DISTRO crystal +# install ros2 packages +RUN apt-get update && apt-get install -y \ + ros-crystal-ros1-bridge \ + ros-crystal-turtlebot2-demo \ + && rm -rf /var/lib/apt/lists/* + +# setup entrypoint +COPY ./ros1_bridge_entrypoint.sh / + +ENTRYPOINT ["/ros1_bridge_entrypoint.sh"] +CMD ["bash"] diff --git a/ros2/crystal/ubuntu/bionic/ros1-bridge/hooks/post_push b/ros2/crystal/ubuntu/bionic/ros1-bridge/hooks/post_push new file mode 100755 index 000000000..7fb608386 --- /dev/null +++ b/ros2/crystal/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 crystal-ros1-bridge; do + docker tag $IMAGE_NAME ${repoName}:${tag} + docker push ${repoName}:${tag} +done diff --git a/ros2/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh b/ros2/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh new file mode 100755 index 000000000..71d942eda --- /dev/null +++ b/ros2/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -e + +# unsetting ROS_DISTRO to silence ROS_DISTRO override warning +unset ROS_DISTRO +# setup ros1 environment +source "/opt/ros/$ROS1_DISTRO/setup.bash" + +# unsetting ROS_DISTRO to silence ROS_DISTRO override warning +unset ROS_DISTRO +# setup ros2 environment +source "/opt/ros/$ROS2_DISTRO/setup.bash" + +unset ROS1_DISTRO +unset ROS2_DISTRO + +exec "$@" diff --git a/ros2/manifest.yaml b/ros2/manifest.yaml index 5f2c82f63..765f17236 100644 --- a/ros2/manifest.yaml +++ b/ros2/manifest.yaml @@ -70,6 +70,34 @@ release_names: aliases: - "$release_name-ros1-bridge" - "$release_name-ros1-bridge-$os_code_name" + crystal: + eol: 2020-XX + os_names: + ubuntu: + os_code_names: + bionic: + rosdistro_name: melodic + <<: *DEFAULT + archs: + - amd64 + - arm64v8 + tag_names: + ros-core: + aliases: + - "$release_name-ros-core" + - "$release_name-ros-core-$os_code_name" + ros-base: + aliases: + - "$release_name-ros-base" + - "$release_name-ros-base-$os_code_name" + desktop: + aliases: + - "$release_name-desktop" + - "$release_name-desktop-$os_code_name" + ros1-bridge: + aliases: + - "$release_name-ros1-bridge" + - "$release_name-ros1-bridge-$os_code_name" meta: maintainers: @@ -102,3 +130,13 @@ hacks: <<: *DEFAULT_HOOKS ros1-bridge: <<: *DEFAULT_HOOKS + crystal: + os_names: + ubuntu: + os_code_names: + bionic: + tag_names: + desktop: + <<: *DEFAULT_HOOKS + ros1-bridge: + <<: *DEFAULT_HOOKS From 4d7a97be7eea5ffcffe91bde35fc963e31e5cd04 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 15 Nov 2018 23:28:42 -0800 Subject: [PATCH 08/35] Update README on ROS2 links --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index ed21ddce4..486d78a5c 100644 --- 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) From 2d461860e8b2dbfa250d03a7defc8e2bd8d49b25 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 15 Nov 2018 23:30:40 -0800 Subject: [PATCH 09/35] Downplay SROS1 images to bolster SROS2 migration --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 486d78a5c..de228d1ef 100644 --- a/README.md +++ b/README.md @@ -48,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) From 29cd64abbd3cee930e53b37afb97c4b5c6a97722 Mon Sep 17 00:00:00 2001 From: Ruffin Date: Fri, 23 Nov 2018 00:04:40 -0800 Subject: [PATCH 10/35] Update EOL date for Crystal --- ros2/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2/manifest.yaml b/ros2/manifest.yaml index 765f17236..170f5cc56 100644 --- a/ros2/manifest.yaml +++ b/ros2/manifest.yaml @@ -71,7 +71,7 @@ release_names: - "$release_name-ros1-bridge" - "$release_name-ros1-bridge-$os_code_name" crystal: - eol: 2020-XX + eol: 2019-12 os_names: ubuntu: os_code_names: From 610d353c67ddc5a037ced85c545dbc563aede6a2 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Sat, 1 Dec 2018 02:50:22 +0700 Subject: [PATCH 11/35] Update template to include bootstrap tools --- ros2/ardent/ubuntu/xenial/ros-core/Dockerfile | 13 ++++++++++++- ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile | 13 ++++++++++++- ros2/crystal/ubuntu/bionic/ros-core/Dockerfile | 13 ++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile index 440d65949..81b2be356 100644 --- a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile @@ -18,17 +18,28 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9 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=0.4.0-1* \ && rm -rf /var/lib/apt/lists/* diff --git a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile index e1201e889..0bdf99d5a 100644 --- a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile @@ -23,17 +23,28 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9 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=0.5.1-0* \ && rm -rf /var/lib/apt/lists/* diff --git a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile index b215078ab..0fc6baa13 100644 --- a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile @@ -23,17 +23,28 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9 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 crystal +# 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 crystal RUN apt-get update && apt-get install -y \ ros-crystal-ros-core \ && rm -rf /var/lib/apt/lists/* From 68f99cf1ed982354b08c713dcffe72e421f148be Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 13 Dec 2018 23:21:40 -0800 Subject: [PATCH 12/35] Update using cleaned template and versions --- ros2/ardent/ubuntu/xenial/ros-core/Dockerfile | 1 - ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile | 3 +-- ros2/crystal/ubuntu/bionic/desktop/Dockerfile | 2 +- ros2/crystal/ubuntu/bionic/ros-base/Dockerfile | 2 +- ros2/crystal/ubuntu/bionic/ros-core/Dockerfile | 5 ++--- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile index 81b2be356..cce03bc9a 100644 --- a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile @@ -10,7 +10,6 @@ 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 diff --git a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile index 0bdf99d5a..4dbb808e4 100644 --- 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,7 +15,6 @@ 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 diff --git a/ros2/crystal/ubuntu/bionic/desktop/Dockerfile b/ros2/crystal/ubuntu/bionic/desktop/Dockerfile index b37a77c1a..967d4e42e 100644 --- a/ros2/crystal/ubuntu/bionic/desktop/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/desktop/Dockerfile @@ -3,6 +3,6 @@ FROM osrf/ros2:crystal-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ - ros-crystal-desktop \ + ros-crystal-desktop=0.6.1-0* \ && rm -rf /var/lib/apt/lists/* diff --git a/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile index f51b2cfa6..1249f1a49 100644 --- a/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile @@ -3,6 +3,6 @@ FROM osrf/ros2:crystal-ros-core # install ros2 packages RUN apt-get update && apt-get install -y \ - ros-crystal-ros-base \ + ros-crystal-ros-base=0.6.1-0* \ && rm -rf /var/lib/apt/lists/* diff --git a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile index 0fc6baa13..bb68eba87 100644 --- a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/crystal/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,7 +15,6 @@ 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 @@ -46,7 +45,7 @@ RUN pip3 install -U \ # install ros2 packages ENV ROS_DISTRO crystal RUN apt-get update && apt-get install -y \ - ros-crystal-ros-core \ + ros-crystal-ros-core=0.6.1-0* \ && rm -rf /var/lib/apt/lists/* # setup entrypoint From 67a754ef0af6a9d44e87778b07783b88de9c6fba Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 13 Dec 2018 23:22:44 -0800 Subject: [PATCH 13/35] Update manefest --- ros2/ros2 | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/ros2/ros2 b/ros2/ros2 index ded87321b..635b3df13 100644 --- a/ros2/ros2 +++ b/ros2/ros2 @@ -9,22 +9,22 @@ GitRepo: https://github.com/osrf/docker_images.git Tags: ardent-ros-core, ardent-ros-core-xenial Architectures: amd64, arm64v8 -GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be Directory: ros2/ardent/ubuntu/xenial/ros-core Tags: ardent-ros-base, ardent-ros-base-xenial Architectures: amd64, arm64v8 -GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be Directory: ros2/ardent/ubuntu/xenial/ros-base Tags: ardent-desktop, ardent-desktop-xenial Architectures: amd64, arm64v8 -GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be Directory: ros2/ardent/ubuntu/xenial/desktop Tags: ardent-ros1-bridge, ardent-ros1-bridge-xenial Architectures: amd64, arm64v8 -GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be Directory: ros2/ardent/ubuntu/xenial/ros1-bridge @@ -36,21 +36,48 @@ Directory: ros2/ardent/ubuntu/xenial/ros1-bridge Tags: bouncy-ros-core, bouncy-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be Directory: ros2/bouncy/ubuntu/bionic/ros-core Tags: bouncy-ros-base, bouncy-ros-base-bionic Architectures: amd64, arm64v8 -GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be Directory: ros2/bouncy/ubuntu/bionic/ros-base Tags: bouncy-desktop, bouncy-desktop-bionic Architectures: amd64, arm64v8 -GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be Directory: ros2/bouncy/ubuntu/bionic/desktop Tags: bouncy-ros1-bridge, bouncy-ros1-bridge-bionic Architectures: amd64, arm64v8 -GitCommit: a78adf272d2609448c529599f11f681e8d27dd70 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be Directory: ros2/bouncy/ubuntu/bionic/ros1-bridge + +################################################################################ +# Release: crystal + +######################################## +# Distro: ubuntu:bionic + +Tags: crystal-ros-core, crystal-ros-core-bionic +Architectures: amd64, arm64v8 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +Directory: ros2/crystal/ubuntu/bionic/ros-core + +Tags: crystal-ros-base, crystal-ros-base-bionic +Architectures: amd64, arm64v8 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +Directory: ros2/crystal/ubuntu/bionic/ros-base + +Tags: crystal-desktop, crystal-desktop-bionic +Architectures: amd64, arm64v8 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +Directory: ros2/crystal/ubuntu/bionic/desktop + +Tags: crystal-ros1-bridge, crystal-ros1-bridge-bionic +Architectures: amd64, arm64v8 +GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +Directory: ros2/crystal/ubuntu/bionic/ros1-bridge + From 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 13:37:09 -0800 Subject: [PATCH 14/35] Update ros2 repo url in dockerfile --- ros2/ardent/ubuntu/xenial/ros-core/Dockerfile | 3 +-- ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile | 3 +-- ros2/crystal/ubuntu/bionic/ros-core/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile index cce03bc9a..7753c5dc2 100644 --- a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile @@ -14,8 +14,7 @@ RUN apt-get update && apt-get install -q -y \ 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 +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 \ diff --git a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile index 4dbb808e4..05330752f 100644 --- a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile @@ -19,8 +19,7 @@ RUN apt-get update && apt-get install -q -y \ 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 +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 \ diff --git a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile index bb68eba87..f9934155f 100644 --- a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile @@ -19,8 +19,7 @@ RUN apt-get update && apt-get install -q -y \ 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 +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 \ From b551a7eff8ba21fe0f3c60ee889cb821c55ca8ef Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 15:07:41 -0800 Subject: [PATCH 15/35] Update manifest --- ros2/ros2 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ros2/ros2 b/ros2/ros2 index 635b3df13..f69a48907 100644 --- a/ros2/ros2 +++ b/ros2/ros2 @@ -9,22 +9,22 @@ GitRepo: https://github.com/osrf/docker_images.git Tags: ardent-ros-core, ardent-ros-core-xenial Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/ardent/ubuntu/xenial/ros-core Tags: ardent-ros-base, ardent-ros-base-xenial Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/ardent/ubuntu/xenial/ros-base Tags: ardent-desktop, ardent-desktop-xenial Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/ardent/ubuntu/xenial/desktop Tags: ardent-ros1-bridge, ardent-ros1-bridge-xenial Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/ardent/ubuntu/xenial/ros1-bridge @@ -36,22 +36,22 @@ Directory: ros2/ardent/ubuntu/xenial/ros1-bridge Tags: bouncy-ros-core, bouncy-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/bouncy/ubuntu/bionic/ros-core Tags: bouncy-ros-base, bouncy-ros-base-bionic Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/bouncy/ubuntu/bionic/ros-base Tags: bouncy-desktop, bouncy-desktop-bionic Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/bouncy/ubuntu/bionic/desktop Tags: bouncy-ros1-bridge, bouncy-ros1-bridge-bionic Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/bouncy/ubuntu/bionic/ros1-bridge @@ -63,21 +63,21 @@ Directory: ros2/bouncy/ubuntu/bionic/ros1-bridge Tags: crystal-ros-core, crystal-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/crystal/ubuntu/bionic/ros-core Tags: crystal-ros-base, crystal-ros-base-bionic Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/crystal/ubuntu/bionic/ros-base Tags: crystal-desktop, crystal-desktop-bionic Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/crystal/ubuntu/bionic/desktop Tags: crystal-ros1-bridge, crystal-ros1-bridge-bionic Architectures: amd64, arm64v8 -GitCommit: 68f99cf1ed982354b08c713dcffe72e421f148be +GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 Directory: ros2/crystal/ubuntu/bionic/ros1-bridge From df63960d6204d0d68027fafde47956c1903a2229 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 18:59:26 -0800 Subject: [PATCH 16/35] Remove desktop and bridge image from manifest and add release name as tag --- ros2/manifest.yaml | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/ros2/manifest.yaml b/ros2/manifest.yaml index 170f5cc56..e040f97ae 100644 --- a/ros2/manifest.yaml +++ b/ros2/manifest.yaml @@ -34,14 +34,7 @@ release_names: aliases: - "$release_name-ros-base" - "$release_name-ros-base-$os_code_name" - desktop: - aliases: - - "$release_name-desktop" - - "$release_name-desktop-$os_code_name" - ros1-bridge: - aliases: - - "$release_name-ros1-bridge" - - "$release_name-ros1-bridge-$os_code_name" + - "$release_name" bouncy: eol: 2019-07 os_names: @@ -62,14 +55,7 @@ release_names: aliases: - "$release_name-ros-base" - "$release_name-ros-base-$os_code_name" - desktop: - aliases: - - "$release_name-desktop" - - "$release_name-desktop-$os_code_name" - ros1-bridge: - aliases: - - "$release_name-ros1-bridge" - - "$release_name-ros1-bridge-$os_code_name" + - "$release_name" crystal: eol: 2019-12 os_names: @@ -90,14 +76,7 @@ release_names: aliases: - "$release_name-ros-base" - "$release_name-ros-base-$os_code_name" - desktop: - aliases: - - "$release_name-desktop" - - "$release_name-desktop-$os_code_name" - ros1-bridge: - aliases: - - "$release_name-ros1-bridge" - - "$release_name-ros1-bridge-$os_code_name" + - "$release_name" meta: maintainers: From 271eb1ca6fdea2d80730b1d47e2dbf881da05469 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 19:00:09 -0800 Subject: [PATCH 17/35] Using ros as repo name for docker images --- ros2/.config/images.yaml.em | 2 +- ros2/.config/platform.yaml.em | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ros2/.config/images.yaml.em b/ros2/.config/images.yaml.em index 3b3664385..def9f1ab7 100644 --- a/ros2/.config/images.yaml.em +++ b/ros2/.config/images.yaml.em @@ -14,7 +14,7 @@ images: ros2_packages: - ros-core ros-base: - base_image: osrf/@(user_name):@(ros2distro_name)-ros-core + base_image: @(user_name):@(ros2distro_name)-ros-core maintainer_name: @(maintainer_name) template_name: docker_images/create_ros2_image.Dockerfile.em template_packages: diff --git a/ros2/.config/platform.yaml.em b/ros2/.config/platform.yaml.em index 62a158130..6ac6d12de 100644 --- a/ros2/.config/platform.yaml.em +++ b/ros2/.config/platform.yaml.em @@ -6,7 +6,7 @@ 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 From fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 19:06:54 -0800 Subject: [PATCH 18/35] Update dockerfiles --- ros2/ardent/ubuntu/xenial/desktop/Dockerfile | 4 ++-- ros2/ardent/ubuntu/xenial/images.yaml.em | 2 +- ros2/ardent/ubuntu/xenial/platform.yaml | 2 +- ros2/ardent/ubuntu/xenial/ros-base/Dockerfile | 4 ++-- ros2/ardent/ubuntu/xenial/ros-core/Dockerfile | 2 +- ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile | 4 ++-- ros2/bouncy/ubuntu/bionic/desktop/Dockerfile | 4 ++-- ros2/bouncy/ubuntu/bionic/images.yaml.em | 2 +- ros2/bouncy/ubuntu/bionic/platform.yaml | 2 +- ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile | 4 ++-- ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile | 2 +- ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile | 4 ++-- ros2/crystal/ubuntu/bionic/desktop/Dockerfile | 4 ++-- ros2/crystal/ubuntu/bionic/images.yaml.em | 2 +- ros2/crystal/ubuntu/bionic/platform.yaml | 2 +- ros2/crystal/ubuntu/bionic/ros-base/Dockerfile | 4 ++-- ros2/crystal/ubuntu/bionic/ros-core/Dockerfile | 2 +- ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile | 4 ++-- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ros2/ardent/ubuntu/xenial/desktop/Dockerfile b/ros2/ardent/ubuntu/xenial/desktop/Dockerfile index d916edea2..a64deb936 100644 --- a/ros2/ardent/ubuntu/xenial/desktop/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/desktop/Dockerfile @@ -1,6 +1,6 @@ -# This is an auto generated Dockerfile for ros2:desktop +# This is an auto generated Dockerfile for ros:desktop # generated from docker_images/create_ros2_image.Dockerfile.em -FROM osrf/ros2:ardent-ros-base +FROM osrf/ros:ardent-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ ros-ardent-desktop=0.4.0-1* \ diff --git a/ros2/ardent/ubuntu/xenial/images.yaml.em b/ros2/ardent/ubuntu/xenial/images.yaml.em index 3b3664385..def9f1ab7 100644 --- a/ros2/ardent/ubuntu/xenial/images.yaml.em +++ b/ros2/ardent/ubuntu/xenial/images.yaml.em @@ -14,7 +14,7 @@ images: ros2_packages: - ros-core ros-base: - base_image: osrf/@(user_name):@(ros2distro_name)-ros-core + base_image: @(user_name):@(ros2distro_name)-ros-core maintainer_name: @(maintainer_name) template_name: docker_images/create_ros2_image.Dockerfile.em template_packages: diff --git a/ros2/ardent/ubuntu/xenial/platform.yaml b/ros2/ardent/ubuntu/xenial/platform.yaml index 2bb1f9204..b3f6be7b5 100644 --- a/ros2/ardent/ubuntu/xenial/platform.yaml +++ b/ros2/ardent/ubuntu/xenial/platform.yaml @@ -6,7 +6,7 @@ platform: os_code_name: xenial rosdistro_name: kinetic ros2distro_name: ardent - user_name: ros2 + user_name: ros maintainer_name: arch: amd64 type: distribution diff --git a/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile b/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile index cc935916f..e4ec28984 100644 --- a/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile @@ -1,6 +1,6 @@ -# This is an auto generated Dockerfile for ros2:ros-base +# This is an auto generated Dockerfile for ros:ros-base # generated from docker_images/create_ros2_image.Dockerfile.em -FROM osrf/ros2:ardent-ros-core +FROM ros:ardent-ros-core # install ros2 packages RUN apt-get update && apt-get install -y \ ros-ardent-ros-base=0.4.0-1* \ diff --git a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile index 7753c5dc2..d88847441 100644 --- a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile @@ -1,4 +1,4 @@ -# This is an auto generated Dockerfile for ros2:ros-core +# This is an auto generated Dockerfile for ros:ros-core # generated from docker_images/create_ros2_core_image.Dockerfile.em FROM ubuntu:xenial diff --git a/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile b/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile index df21872c6..95beb4203 100644 --- a/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile @@ -1,6 +1,6 @@ -# This is an auto generated Dockerfile for ros2:ros1-bridge +# This is an auto generated Dockerfile for ros:ros1-bridge # generated from docker_images/create_ros2_ros1_bridge_image.Dockerfile.em -FROM osrf/ros2:ardent-desktop +FROM osrf/ros:ardent-desktop # setup keys RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 diff --git a/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile b/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile index a442157a7..7a10894f0 100644 --- a/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile @@ -1,6 +1,6 @@ -# This is an auto generated Dockerfile for ros2:desktop +# This is an auto generated Dockerfile for ros:desktop # generated from docker_images/create_ros2_image.Dockerfile.em -FROM osrf/ros2:bouncy-ros-base +FROM osrf/ros:bouncy-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ ros-bouncy-desktop=0.5.1-0* \ diff --git a/ros2/bouncy/ubuntu/bionic/images.yaml.em b/ros2/bouncy/ubuntu/bionic/images.yaml.em index 3b3664385..def9f1ab7 100644 --- a/ros2/bouncy/ubuntu/bionic/images.yaml.em +++ b/ros2/bouncy/ubuntu/bionic/images.yaml.em @@ -14,7 +14,7 @@ images: ros2_packages: - ros-core ros-base: - base_image: osrf/@(user_name):@(ros2distro_name)-ros-core + base_image: @(user_name):@(ros2distro_name)-ros-core maintainer_name: @(maintainer_name) template_name: docker_images/create_ros2_image.Dockerfile.em template_packages: diff --git a/ros2/bouncy/ubuntu/bionic/platform.yaml b/ros2/bouncy/ubuntu/bionic/platform.yaml index 967954a9e..be8bc9984 100644 --- a/ros2/bouncy/ubuntu/bionic/platform.yaml +++ b/ros2/bouncy/ubuntu/bionic/platform.yaml @@ -6,7 +6,7 @@ platform: os_code_name: bionic rosdistro_name: melodic ros2distro_name: bouncy - user_name: ros2 + user_name: ros maintainer_name: arch: amd64 type: distribution diff --git a/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile index 26b43ca28..4127c38f8 100644 --- a/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile @@ -1,6 +1,6 @@ -# This is an auto generated Dockerfile for ros2:ros-base +# This is an auto generated Dockerfile for ros:ros-base # generated from docker_images/create_ros2_image.Dockerfile.em -FROM osrf/ros2:bouncy-ros-core +FROM ros:bouncy-ros-core # install ros2 packages RUN apt-get update && apt-get install -y \ ros-bouncy-ros-base=0.5.1-0* \ diff --git a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile index 05330752f..ec20c6b52 100644 --- a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile @@ -1,4 +1,4 @@ -# This is an auto generated Dockerfile for ros2:ros-core +# This is an auto generated Dockerfile for ros:ros-core # generated from docker_images/create_ros2_core_image.Dockerfile.em FROM ubuntu:bionic diff --git a/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile index bbcb79a4c..1772ebe5c 100644 --- a/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,6 +1,6 @@ -# This is an auto generated Dockerfile for ros2:ros1-bridge +# This is an auto generated Dockerfile for ros:ros1-bridge # generated from docker_images/create_ros2_ros1_bridge_image.Dockerfile.em -FROM osrf/ros2:bouncy-desktop +FROM osrf/ros:bouncy-desktop # setup keys RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 diff --git a/ros2/crystal/ubuntu/bionic/desktop/Dockerfile b/ros2/crystal/ubuntu/bionic/desktop/Dockerfile index 967d4e42e..7017071d8 100644 --- a/ros2/crystal/ubuntu/bionic/desktop/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/desktop/Dockerfile @@ -1,6 +1,6 @@ -# This is an auto generated Dockerfile for ros2:desktop +# This is an auto generated Dockerfile for ros:desktop # generated from docker_images/create_ros2_image.Dockerfile.em -FROM osrf/ros2:crystal-ros-base +FROM osrf/ros:crystal-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ ros-crystal-desktop=0.6.1-0* \ diff --git a/ros2/crystal/ubuntu/bionic/images.yaml.em b/ros2/crystal/ubuntu/bionic/images.yaml.em index 3b3664385..def9f1ab7 100644 --- a/ros2/crystal/ubuntu/bionic/images.yaml.em +++ b/ros2/crystal/ubuntu/bionic/images.yaml.em @@ -14,7 +14,7 @@ images: ros2_packages: - ros-core ros-base: - base_image: osrf/@(user_name):@(ros2distro_name)-ros-core + base_image: @(user_name):@(ros2distro_name)-ros-core maintainer_name: @(maintainer_name) template_name: docker_images/create_ros2_image.Dockerfile.em template_packages: diff --git a/ros2/crystal/ubuntu/bionic/platform.yaml b/ros2/crystal/ubuntu/bionic/platform.yaml index 182fd3ae7..9bdb5dbb9 100644 --- a/ros2/crystal/ubuntu/bionic/platform.yaml +++ b/ros2/crystal/ubuntu/bionic/platform.yaml @@ -6,7 +6,7 @@ platform: os_code_name: bionic rosdistro_name: melodic ros2distro_name: crystal - user_name: ros2 + user_name: ros maintainer_name: arch: amd64 type: distribution diff --git a/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile index 1249f1a49..55ece70b3 100644 --- a/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile @@ -1,6 +1,6 @@ -# This is an auto generated Dockerfile for ros2:ros-base +# This is an auto generated Dockerfile for ros:ros-base # generated from docker_images/create_ros2_image.Dockerfile.em -FROM osrf/ros2:crystal-ros-core +FROM ros:crystal-ros-core # install ros2 packages RUN apt-get update && apt-get install -y \ ros-crystal-ros-base=0.6.1-0* \ diff --git a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile index f9934155f..f2735da01 100644 --- a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile @@ -1,4 +1,4 @@ -# This is an auto generated Dockerfile for ros2:ros-core +# This is an auto generated Dockerfile for ros:ros-core # generated from docker_images/create_ros2_core_image.Dockerfile.em FROM ubuntu:bionic diff --git a/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile b/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile index 51c5cf4e6..09d544b35 100644 --- a/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,6 +1,6 @@ -# This is an auto generated Dockerfile for ros2:ros1-bridge +# This is an auto generated Dockerfile for ros:ros1-bridge # generated from docker_images/create_ros2_ros1_bridge_image.Dockerfile.em -FROM osrf/ros2:crystal-desktop +FROM osrf/ros:crystal-desktop # setup keys RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 From 2e04cb4a0f98082c6e7b74632c34dadc9e299bc9 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 19:08:25 -0800 Subject: [PATCH 19/35] Update manifest --- ros2/ros2 | 48 +++++++++--------------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/ros2/ros2 b/ros2/ros2 index f69a48907..d95ac804a 100644 --- a/ros2/ros2 +++ b/ros2/ros2 @@ -9,24 +9,14 @@ GitRepo: https://github.com/osrf/docker_images.git Tags: ardent-ros-core, ardent-ros-core-xenial Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 +GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 Directory: ros2/ardent/ubuntu/xenial/ros-core -Tags: ardent-ros-base, ardent-ros-base-xenial +Tags: ardent-ros-base, ardent-ros-base-xenial, ardent Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 +GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 Directory: ros2/ardent/ubuntu/xenial/ros-base -Tags: ardent-desktop, ardent-desktop-xenial -Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 -Directory: ros2/ardent/ubuntu/xenial/desktop - -Tags: ardent-ros1-bridge, ardent-ros1-bridge-xenial -Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 -Directory: ros2/ardent/ubuntu/xenial/ros1-bridge - ################################################################################ # Release: bouncy @@ -36,24 +26,14 @@ Directory: ros2/ardent/ubuntu/xenial/ros1-bridge Tags: bouncy-ros-core, bouncy-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 +GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 Directory: ros2/bouncy/ubuntu/bionic/ros-core -Tags: bouncy-ros-base, bouncy-ros-base-bionic +Tags: bouncy-ros-base, bouncy-ros-base-bionic, bouncy Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 +GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 Directory: ros2/bouncy/ubuntu/bionic/ros-base -Tags: bouncy-desktop, bouncy-desktop-bionic -Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 -Directory: ros2/bouncy/ubuntu/bionic/desktop - -Tags: bouncy-ros1-bridge, bouncy-ros1-bridge-bionic -Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 -Directory: ros2/bouncy/ubuntu/bionic/ros1-bridge - ################################################################################ # Release: crystal @@ -63,21 +43,11 @@ Directory: ros2/bouncy/ubuntu/bionic/ros1-bridge Tags: crystal-ros-core, crystal-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 +GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 Directory: ros2/crystal/ubuntu/bionic/ros-core -Tags: crystal-ros-base, crystal-ros-base-bionic +Tags: crystal-ros-base, crystal-ros-base-bionic, crystal Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 +GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 Directory: ros2/crystal/ubuntu/bionic/ros-base -Tags: crystal-desktop, crystal-desktop-bionic -Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 -Directory: ros2/crystal/ubuntu/bionic/desktop - -Tags: crystal-ros1-bridge, crystal-ros1-bridge-bionic -Architectures: amd64, arm64v8 -GitCommit: 1e3e24d2c19bf8d7ae1e3cbd4572df46eb5aae18 -Directory: ros2/crystal/ubuntu/bionic/ros1-bridge - From aa4f59e7e40dcd5e9a2d2de8a86c9f47cb33e3d0 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 21:13:16 -0800 Subject: [PATCH 20/35] Update master template to use same entrypoint name --- ros2/.config/images.yaml.em | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ros2/.config/images.yaml.em b/ros2/.config/images.yaml.em index def9f1ab7..9402c2588 100644 --- a/ros2/.config/images.yaml.em +++ b/ros2/.config/images.yaml.em @@ -5,8 +5,8 @@ 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: @@ -16,7 +16,7 @@ images: ros-base: base_image: @(user_name):@(ros2distro_name)-ros-core 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: @@ -24,7 +24,7 @@ images: desktop: base_image: osrf/@(user_name):@(ros2distro_name)-ros-base 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: @@ -32,8 +32,8 @@ images: ros1-bridge: base_image: osrf/@(user_name):@(ros2distro_name)-desktop 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/create_ros_ros1_bridge_image.Dockerfile.em + entrypoint_name: docker_images_ros2/ros1_bridge_entrypoint.sh template_packages: - docker_templates ros2_packages: From c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 21:13:43 -0800 Subject: [PATCH 21/35] Update Dockerfiles to use same entrypoint name --- ros2/ardent/ubuntu/xenial/desktop/Dockerfile | 2 +- ros2/ardent/ubuntu/xenial/images.yaml.em | 12 ++++++------ ros2/ardent/ubuntu/xenial/ros-base/Dockerfile | 2 +- ros2/ardent/ubuntu/xenial/ros-core/Dockerfile | 6 +++--- .../{ros2_entrypoint.sh => ros_entrypoint.sh} | 0 ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile | 2 +- ros2/bouncy/ubuntu/bionic/desktop/Dockerfile | 2 +- ros2/bouncy/ubuntu/bionic/images.yaml.em | 12 ++++++------ ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile | 2 +- ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile | 6 +++--- .../{ros2_entrypoint.sh => ros_entrypoint.sh} | 0 ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile | 2 +- ros2/crystal/ubuntu/bionic/desktop/Dockerfile | 2 +- ros2/crystal/ubuntu/bionic/images.yaml.em | 12 ++++++------ ros2/crystal/ubuntu/bionic/ros-base/Dockerfile | 2 +- ros2/crystal/ubuntu/bionic/ros-core/Dockerfile | 6 +++--- .../{ros2_entrypoint.sh => ros_entrypoint.sh} | 0 ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile | 2 +- 18 files changed, 36 insertions(+), 36 deletions(-) rename ros2/ardent/ubuntu/xenial/ros-core/{ros2_entrypoint.sh => ros_entrypoint.sh} (100%) rename ros2/bouncy/ubuntu/bionic/ros-core/{ros2_entrypoint.sh => ros_entrypoint.sh} (100%) rename ros2/crystal/ubuntu/bionic/ros-core/{ros2_entrypoint.sh => ros_entrypoint.sh} (100%) diff --git a/ros2/ardent/ubuntu/xenial/desktop/Dockerfile b/ros2/ardent/ubuntu/xenial/desktop/Dockerfile index a64deb936..85849d1bb 100644 --- a/ros2/ardent/ubuntu/xenial/desktop/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/desktop/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:desktop -# generated from docker_images/create_ros2_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_image.Dockerfile.em FROM osrf/ros:ardent-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ diff --git a/ros2/ardent/ubuntu/xenial/images.yaml.em b/ros2/ardent/ubuntu/xenial/images.yaml.em index def9f1ab7..9402c2588 100644 --- a/ros2/ardent/ubuntu/xenial/images.yaml.em +++ b/ros2/ardent/ubuntu/xenial/images.yaml.em @@ -5,8 +5,8 @@ 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: @@ -16,7 +16,7 @@ images: ros-base: base_image: @(user_name):@(ros2distro_name)-ros-core 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: @@ -24,7 +24,7 @@ images: desktop: base_image: osrf/@(user_name):@(ros2distro_name)-ros-base 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: @@ -32,8 +32,8 @@ images: ros1-bridge: base_image: osrf/@(user_name):@(ros2distro_name)-desktop 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/create_ros_ros1_bridge_image.Dockerfile.em + entrypoint_name: docker_images_ros2/ros1_bridge_entrypoint.sh template_packages: - docker_templates ros2_packages: diff --git a/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile b/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile index e4ec28984..dc0ab10dd 100644 --- a/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros-base -# generated from docker_images/create_ros2_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_image.Dockerfile.em FROM ros:ardent-ros-core # install ros2 packages RUN apt-get update && apt-get install -y \ diff --git a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile index d88847441..002bb99e6 100644 --- a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros-core -# generated from docker_images/create_ros2_core_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_core_image.Dockerfile.em FROM ubuntu:xenial # install packages @@ -43,7 +43,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # setup entrypoint -COPY ./ros2_entrypoint.sh / +COPY ./ros_entrypoint.sh / -ENTRYPOINT ["/ros2_entrypoint.sh"] +ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["bash"] diff --git a/ros2/ardent/ubuntu/xenial/ros-core/ros2_entrypoint.sh b/ros2/ardent/ubuntu/xenial/ros-core/ros_entrypoint.sh similarity index 100% rename from ros2/ardent/ubuntu/xenial/ros-core/ros2_entrypoint.sh rename to ros2/ardent/ubuntu/xenial/ros-core/ros_entrypoint.sh diff --git a/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile b/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile index 95beb4203..f3574c140 100644 --- a/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile +++ b/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros1-bridge -# generated from docker_images/create_ros2_ros1_bridge_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em FROM osrf/ros:ardent-desktop # setup keys diff --git a/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile b/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile index 7a10894f0..4ad459caa 100644 --- a/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:desktop -# generated from docker_images/create_ros2_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_image.Dockerfile.em FROM osrf/ros:bouncy-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ diff --git a/ros2/bouncy/ubuntu/bionic/images.yaml.em b/ros2/bouncy/ubuntu/bionic/images.yaml.em index def9f1ab7..9402c2588 100644 --- a/ros2/bouncy/ubuntu/bionic/images.yaml.em +++ b/ros2/bouncy/ubuntu/bionic/images.yaml.em @@ -5,8 +5,8 @@ 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: @@ -16,7 +16,7 @@ images: ros-base: base_image: @(user_name):@(ros2distro_name)-ros-core 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: @@ -24,7 +24,7 @@ images: desktop: base_image: osrf/@(user_name):@(ros2distro_name)-ros-base 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: @@ -32,8 +32,8 @@ images: ros1-bridge: base_image: osrf/@(user_name):@(ros2distro_name)-desktop 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/create_ros_ros1_bridge_image.Dockerfile.em + entrypoint_name: docker_images_ros2/ros1_bridge_entrypoint.sh template_packages: - docker_templates ros2_packages: diff --git a/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile index 4127c38f8..1ae375213 100644 --- a/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros-base -# generated from docker_images/create_ros2_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_image.Dockerfile.em FROM ros:bouncy-ros-core # install ros2 packages RUN apt-get update && apt-get install -y \ diff --git a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile index ec20c6b52..a880f4e7c 100644 --- a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros-core -# generated from docker_images/create_ros2_core_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_core_image.Dockerfile.em FROM ubuntu:bionic # setup timezone @@ -48,7 +48,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # setup entrypoint -COPY ./ros2_entrypoint.sh / +COPY ./ros_entrypoint.sh / -ENTRYPOINT ["/ros2_entrypoint.sh"] +ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["bash"] diff --git a/ros2/bouncy/ubuntu/bionic/ros-core/ros2_entrypoint.sh b/ros2/bouncy/ubuntu/bionic/ros-core/ros_entrypoint.sh similarity index 100% rename from ros2/bouncy/ubuntu/bionic/ros-core/ros2_entrypoint.sh rename to ros2/bouncy/ubuntu/bionic/ros-core/ros_entrypoint.sh diff --git a/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile b/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile index 1772ebe5c..280350dd9 100644 --- a/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros1-bridge -# generated from docker_images/create_ros2_ros1_bridge_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em FROM osrf/ros:bouncy-desktop # setup keys diff --git a/ros2/crystal/ubuntu/bionic/desktop/Dockerfile b/ros2/crystal/ubuntu/bionic/desktop/Dockerfile index 7017071d8..56309ac3c 100644 --- a/ros2/crystal/ubuntu/bionic/desktop/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/desktop/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:desktop -# generated from docker_images/create_ros2_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_image.Dockerfile.em FROM osrf/ros:crystal-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ diff --git a/ros2/crystal/ubuntu/bionic/images.yaml.em b/ros2/crystal/ubuntu/bionic/images.yaml.em index def9f1ab7..9402c2588 100644 --- a/ros2/crystal/ubuntu/bionic/images.yaml.em +++ b/ros2/crystal/ubuntu/bionic/images.yaml.em @@ -5,8 +5,8 @@ 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: @@ -16,7 +16,7 @@ images: ros-base: base_image: @(user_name):@(ros2distro_name)-ros-core 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: @@ -24,7 +24,7 @@ images: desktop: base_image: osrf/@(user_name):@(ros2distro_name)-ros-base 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: @@ -32,8 +32,8 @@ images: ros1-bridge: base_image: osrf/@(user_name):@(ros2distro_name)-desktop 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/create_ros_ros1_bridge_image.Dockerfile.em + entrypoint_name: docker_images_ros2/ros1_bridge_entrypoint.sh template_packages: - docker_templates ros2_packages: diff --git a/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile index 55ece70b3..f80be072b 100644 --- a/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros-base -# generated from docker_images/create_ros2_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_image.Dockerfile.em FROM ros:crystal-ros-core # install ros2 packages RUN apt-get update && apt-get install -y \ diff --git a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile index f2735da01..43ca89999 100644 --- a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros-core -# generated from docker_images/create_ros2_core_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_core_image.Dockerfile.em FROM ubuntu:bionic # setup timezone @@ -48,7 +48,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # setup entrypoint -COPY ./ros2_entrypoint.sh / +COPY ./ros_entrypoint.sh / -ENTRYPOINT ["/ros2_entrypoint.sh"] +ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["bash"] diff --git a/ros2/crystal/ubuntu/bionic/ros-core/ros2_entrypoint.sh b/ros2/crystal/ubuntu/bionic/ros-core/ros_entrypoint.sh similarity index 100% rename from ros2/crystal/ubuntu/bionic/ros-core/ros2_entrypoint.sh rename to ros2/crystal/ubuntu/bionic/ros-core/ros_entrypoint.sh diff --git a/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile b/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile index 09d544b35..11bb7d2fe 100644 --- a/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros1-bridge -# generated from docker_images/create_ros2_ros1_bridge_image.Dockerfile.em +# generated from docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em FROM osrf/ros:crystal-desktop # setup keys From a18c67b26e121c906a827f0704d4bdcd374a7a55 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 21:16:26 -0800 Subject: [PATCH 22/35] Update manifest --- ros2/ros2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ros2/ros2 b/ros2/ros2 index d95ac804a..cd48145b7 100644 --- a/ros2/ros2 +++ b/ros2/ros2 @@ -9,12 +9,12 @@ GitRepo: https://github.com/osrf/docker_images.git Tags: ardent-ros-core, ardent-ros-core-xenial Architectures: amd64, arm64v8 -GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 +GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 Directory: ros2/ardent/ubuntu/xenial/ros-core Tags: ardent-ros-base, ardent-ros-base-xenial, ardent Architectures: amd64, arm64v8 -GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 +GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 Directory: ros2/ardent/ubuntu/xenial/ros-base @@ -26,12 +26,12 @@ Directory: ros2/ardent/ubuntu/xenial/ros-base Tags: bouncy-ros-core, bouncy-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 +GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 Directory: ros2/bouncy/ubuntu/bionic/ros-core Tags: bouncy-ros-base, bouncy-ros-base-bionic, bouncy Architectures: amd64, arm64v8 -GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 +GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 Directory: ros2/bouncy/ubuntu/bionic/ros-base @@ -43,11 +43,11 @@ Directory: ros2/bouncy/ubuntu/bionic/ros-base Tags: crystal-ros-core, crystal-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 +GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 Directory: ros2/crystal/ubuntu/bionic/ros-core Tags: crystal-ros-base, crystal-ros-base-bionic, crystal Architectures: amd64, arm64v8 -GitCommit: fd8d22d044b4c09823b9fcbdcafbc03db2b021d0 +GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 Directory: ros2/crystal/ubuntu/bionic/ros-base From b6291e8bc3a8d8c05bec46d111323517acd75b9e Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 14 Dec 2018 22:46:49 -0800 Subject: [PATCH 23/35] Merge versions into offical ros repo --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index de228d1ef..0f8c23d03 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,6 @@ 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) From 68305a008812499d5e11a88017ed9c2a17dbd691 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 24 Dec 2018 08:22:04 -0800 Subject: [PATCH 24/35] Move ros2 files into common ros difrecotry --- ros/.config/{ => ros1}/Makefile.em | 0 ros/.config/{ => ros1}/images.yaml.em | 0 ros/.config/{ => ros1}/platform.yaml.em | 0 {ros2/.config => ros/.config/ros2}/Makefile.em | 0 {ros2/.config => ros/.config/ros2}/images.yaml.em | 0 {ros2/.config => ros/.config/ros2}/platform.yaml.em | 0 {ros2 => ros}/ardent/ubuntu/xenial/Makefile | 0 {ros2 => ros}/ardent/ubuntu/xenial/desktop/Dockerfile | 0 {ros2 => ros}/ardent/ubuntu/xenial/desktop/hooks/post_push | 0 {ros2 => ros}/ardent/ubuntu/xenial/images.yaml.em | 0 {ros2 => ros}/ardent/ubuntu/xenial/platform.yaml | 0 {ros2 => ros}/ardent/ubuntu/xenial/ros-base/Dockerfile | 0 {ros2 => ros}/ardent/ubuntu/xenial/ros-core/Dockerfile | 0 {ros2 => ros}/ardent/ubuntu/xenial/ros-core/ros_entrypoint.sh | 0 {ros2 => ros}/ardent/ubuntu/xenial/ros1-bridge/Dockerfile | 0 {ros2 => ros}/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push | 0 .../ardent/ubuntu/xenial/ros1-bridge/ros1_bridge_entrypoint.sh | 0 {ros2 => ros}/bouncy/ubuntu/bionic/Makefile | 0 {ros2 => ros}/bouncy/ubuntu/bionic/desktop/Dockerfile | 0 {ros2 => ros}/bouncy/ubuntu/bionic/desktop/hooks/post_push | 0 {ros2 => ros}/bouncy/ubuntu/bionic/images.yaml.em | 0 {ros2 => ros}/bouncy/ubuntu/bionic/platform.yaml | 0 {ros2 => ros}/bouncy/ubuntu/bionic/ros-base/Dockerfile | 0 {ros2 => ros}/bouncy/ubuntu/bionic/ros-core/Dockerfile | 0 {ros2 => ros}/bouncy/ubuntu/bionic/ros-core/ros_entrypoint.sh | 0 {ros2 => ros}/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile | 0 {ros2 => ros}/bouncy/ubuntu/bionic/ros1-bridge/hooks/post_push | 0 .../bouncy/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh | 0 {ros2 => ros}/crystal/ubuntu/bionic/Makefile | 0 {ros2 => ros}/crystal/ubuntu/bionic/desktop/Dockerfile | 0 {ros2 => ros}/crystal/ubuntu/bionic/desktop/hooks/post_push | 0 {ros2 => ros}/crystal/ubuntu/bionic/images.yaml.em | 0 {ros2 => ros}/crystal/ubuntu/bionic/platform.yaml | 0 {ros2 => ros}/crystal/ubuntu/bionic/ros-base/Dockerfile | 0 {ros2 => ros}/crystal/ubuntu/bionic/ros-core/Dockerfile | 0 {ros2 => ros}/crystal/ubuntu/bionic/ros-core/ros_entrypoint.sh | 0 {ros2 => ros}/crystal/ubuntu/bionic/ros1-bridge/Dockerfile | 0 {ros2 => ros}/crystal/ubuntu/bionic/ros1-bridge/hooks/post_push | 0 .../crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh | 0 {ros2/source => ros/source/ros2}/Makefile | 0 {ros2/source => ros/source/ros2}/images.yaml.em | 0 {ros2/source => ros/source/ros2}/platform.yaml | 0 {ros2/source => ros/source/ros2}/source/Dockerfile | 0 {ros2/source => ros/source/ros2}/source/ros2_source_entrypoint.sh | 0 44 files changed, 0 insertions(+), 0 deletions(-) rename ros/.config/{ => ros1}/Makefile.em (100%) rename ros/.config/{ => ros1}/images.yaml.em (100%) rename ros/.config/{ => ros1}/platform.yaml.em (100%) rename {ros2/.config => ros/.config/ros2}/Makefile.em (100%) rename {ros2/.config => ros/.config/ros2}/images.yaml.em (100%) rename {ros2/.config => ros/.config/ros2}/platform.yaml.em (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/Makefile (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/desktop/Dockerfile (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/desktop/hooks/post_push (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/images.yaml.em (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/platform.yaml (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/ros-base/Dockerfile (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/ros-core/Dockerfile (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/ros-core/ros_entrypoint.sh (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/ros1-bridge/Dockerfile (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push (100%) rename {ros2 => ros}/ardent/ubuntu/xenial/ros1-bridge/ros1_bridge_entrypoint.sh (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/Makefile (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/desktop/Dockerfile (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/desktop/hooks/post_push (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/images.yaml.em (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/platform.yaml (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/ros-base/Dockerfile (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/ros-core/Dockerfile (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/ros-core/ros_entrypoint.sh (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/ros1-bridge/hooks/post_push (100%) rename {ros2 => ros}/bouncy/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/Makefile (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/desktop/Dockerfile (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/desktop/hooks/post_push (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/images.yaml.em (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/platform.yaml (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/ros-base/Dockerfile (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/ros-core/Dockerfile (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/ros-core/ros_entrypoint.sh (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/ros1-bridge/Dockerfile (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/ros1-bridge/hooks/post_push (100%) rename {ros2 => ros}/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh (100%) rename {ros2/source => ros/source/ros2}/Makefile (100%) rename {ros2/source => ros/source/ros2}/images.yaml.em (100%) rename {ros2/source => ros/source/ros2}/platform.yaml (100%) rename {ros2/source => ros/source/ros2}/source/Dockerfile (100%) rename {ros2/source => ros/source/ros2}/source/ros2_source_entrypoint.sh (100%) diff --git a/ros/.config/Makefile.em b/ros/.config/ros1/Makefile.em similarity index 100% rename from ros/.config/Makefile.em rename to ros/.config/ros1/Makefile.em diff --git a/ros/.config/images.yaml.em b/ros/.config/ros1/images.yaml.em similarity index 100% rename from ros/.config/images.yaml.em rename to ros/.config/ros1/images.yaml.em diff --git a/ros/.config/platform.yaml.em b/ros/.config/ros1/platform.yaml.em similarity index 100% rename from ros/.config/platform.yaml.em rename to ros/.config/ros1/platform.yaml.em diff --git a/ros2/.config/Makefile.em b/ros/.config/ros2/Makefile.em similarity index 100% rename from ros2/.config/Makefile.em rename to ros/.config/ros2/Makefile.em diff --git a/ros2/.config/images.yaml.em b/ros/.config/ros2/images.yaml.em similarity index 100% rename from ros2/.config/images.yaml.em rename to ros/.config/ros2/images.yaml.em diff --git a/ros2/.config/platform.yaml.em b/ros/.config/ros2/platform.yaml.em similarity index 100% rename from ros2/.config/platform.yaml.em rename to ros/.config/ros2/platform.yaml.em diff --git a/ros2/ardent/ubuntu/xenial/Makefile b/ros/ardent/ubuntu/xenial/Makefile similarity index 100% rename from ros2/ardent/ubuntu/xenial/Makefile rename to ros/ardent/ubuntu/xenial/Makefile diff --git a/ros2/ardent/ubuntu/xenial/desktop/Dockerfile b/ros/ardent/ubuntu/xenial/desktop/Dockerfile similarity index 100% rename from ros2/ardent/ubuntu/xenial/desktop/Dockerfile rename to ros/ardent/ubuntu/xenial/desktop/Dockerfile diff --git a/ros2/ardent/ubuntu/xenial/desktop/hooks/post_push b/ros/ardent/ubuntu/xenial/desktop/hooks/post_push similarity index 100% rename from ros2/ardent/ubuntu/xenial/desktop/hooks/post_push rename to ros/ardent/ubuntu/xenial/desktop/hooks/post_push diff --git a/ros2/ardent/ubuntu/xenial/images.yaml.em b/ros/ardent/ubuntu/xenial/images.yaml.em similarity index 100% rename from ros2/ardent/ubuntu/xenial/images.yaml.em rename to ros/ardent/ubuntu/xenial/images.yaml.em diff --git a/ros2/ardent/ubuntu/xenial/platform.yaml b/ros/ardent/ubuntu/xenial/platform.yaml similarity index 100% rename from ros2/ardent/ubuntu/xenial/platform.yaml rename to ros/ardent/ubuntu/xenial/platform.yaml diff --git a/ros2/ardent/ubuntu/xenial/ros-base/Dockerfile b/ros/ardent/ubuntu/xenial/ros-base/Dockerfile similarity index 100% rename from ros2/ardent/ubuntu/xenial/ros-base/Dockerfile rename to ros/ardent/ubuntu/xenial/ros-base/Dockerfile diff --git a/ros2/ardent/ubuntu/xenial/ros-core/Dockerfile b/ros/ardent/ubuntu/xenial/ros-core/Dockerfile similarity index 100% rename from ros2/ardent/ubuntu/xenial/ros-core/Dockerfile rename to ros/ardent/ubuntu/xenial/ros-core/Dockerfile diff --git a/ros2/ardent/ubuntu/xenial/ros-core/ros_entrypoint.sh b/ros/ardent/ubuntu/xenial/ros-core/ros_entrypoint.sh similarity index 100% rename from ros2/ardent/ubuntu/xenial/ros-core/ros_entrypoint.sh rename to ros/ardent/ubuntu/xenial/ros-core/ros_entrypoint.sh diff --git a/ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile b/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile similarity index 100% rename from ros2/ardent/ubuntu/xenial/ros1-bridge/Dockerfile rename to ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile diff --git a/ros2/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push b/ros/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push similarity index 100% rename from ros2/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push rename to ros/ardent/ubuntu/xenial/ros1-bridge/hooks/post_push diff --git a/ros2/ardent/ubuntu/xenial/ros1-bridge/ros1_bridge_entrypoint.sh b/ros/ardent/ubuntu/xenial/ros1-bridge/ros1_bridge_entrypoint.sh similarity index 100% rename from ros2/ardent/ubuntu/xenial/ros1-bridge/ros1_bridge_entrypoint.sh rename to ros/ardent/ubuntu/xenial/ros1-bridge/ros1_bridge_entrypoint.sh diff --git a/ros2/bouncy/ubuntu/bionic/Makefile b/ros/bouncy/ubuntu/bionic/Makefile similarity index 100% rename from ros2/bouncy/ubuntu/bionic/Makefile rename to ros/bouncy/ubuntu/bionic/Makefile diff --git a/ros2/bouncy/ubuntu/bionic/desktop/Dockerfile b/ros/bouncy/ubuntu/bionic/desktop/Dockerfile similarity index 100% rename from ros2/bouncy/ubuntu/bionic/desktop/Dockerfile rename to ros/bouncy/ubuntu/bionic/desktop/Dockerfile diff --git a/ros2/bouncy/ubuntu/bionic/desktop/hooks/post_push b/ros/bouncy/ubuntu/bionic/desktop/hooks/post_push similarity index 100% rename from ros2/bouncy/ubuntu/bionic/desktop/hooks/post_push rename to ros/bouncy/ubuntu/bionic/desktop/hooks/post_push diff --git a/ros2/bouncy/ubuntu/bionic/images.yaml.em b/ros/bouncy/ubuntu/bionic/images.yaml.em similarity index 100% rename from ros2/bouncy/ubuntu/bionic/images.yaml.em rename to ros/bouncy/ubuntu/bionic/images.yaml.em diff --git a/ros2/bouncy/ubuntu/bionic/platform.yaml b/ros/bouncy/ubuntu/bionic/platform.yaml similarity index 100% rename from ros2/bouncy/ubuntu/bionic/platform.yaml rename to ros/bouncy/ubuntu/bionic/platform.yaml diff --git a/ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile b/ros/bouncy/ubuntu/bionic/ros-base/Dockerfile similarity index 100% rename from ros2/bouncy/ubuntu/bionic/ros-base/Dockerfile rename to ros/bouncy/ubuntu/bionic/ros-base/Dockerfile diff --git a/ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile b/ros/bouncy/ubuntu/bionic/ros-core/Dockerfile similarity index 100% rename from ros2/bouncy/ubuntu/bionic/ros-core/Dockerfile rename to ros/bouncy/ubuntu/bionic/ros-core/Dockerfile diff --git a/ros2/bouncy/ubuntu/bionic/ros-core/ros_entrypoint.sh b/ros/bouncy/ubuntu/bionic/ros-core/ros_entrypoint.sh similarity index 100% rename from ros2/bouncy/ubuntu/bionic/ros-core/ros_entrypoint.sh rename to ros/bouncy/ubuntu/bionic/ros-core/ros_entrypoint.sh diff --git a/ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile similarity index 100% rename from ros2/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile rename to ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile diff --git a/ros2/bouncy/ubuntu/bionic/ros1-bridge/hooks/post_push b/ros/bouncy/ubuntu/bionic/ros1-bridge/hooks/post_push similarity index 100% rename from ros2/bouncy/ubuntu/bionic/ros1-bridge/hooks/post_push rename to ros/bouncy/ubuntu/bionic/ros1-bridge/hooks/post_push diff --git a/ros2/bouncy/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh b/ros/bouncy/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh similarity index 100% rename from ros2/bouncy/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh rename to ros/bouncy/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh diff --git a/ros2/crystal/ubuntu/bionic/Makefile b/ros/crystal/ubuntu/bionic/Makefile similarity index 100% rename from ros2/crystal/ubuntu/bionic/Makefile rename to ros/crystal/ubuntu/bionic/Makefile diff --git a/ros2/crystal/ubuntu/bionic/desktop/Dockerfile b/ros/crystal/ubuntu/bionic/desktop/Dockerfile similarity index 100% rename from ros2/crystal/ubuntu/bionic/desktop/Dockerfile rename to ros/crystal/ubuntu/bionic/desktop/Dockerfile diff --git a/ros2/crystal/ubuntu/bionic/desktop/hooks/post_push b/ros/crystal/ubuntu/bionic/desktop/hooks/post_push similarity index 100% rename from ros2/crystal/ubuntu/bionic/desktop/hooks/post_push rename to ros/crystal/ubuntu/bionic/desktop/hooks/post_push diff --git a/ros2/crystal/ubuntu/bionic/images.yaml.em b/ros/crystal/ubuntu/bionic/images.yaml.em similarity index 100% rename from ros2/crystal/ubuntu/bionic/images.yaml.em rename to ros/crystal/ubuntu/bionic/images.yaml.em diff --git a/ros2/crystal/ubuntu/bionic/platform.yaml b/ros/crystal/ubuntu/bionic/platform.yaml similarity index 100% rename from ros2/crystal/ubuntu/bionic/platform.yaml rename to ros/crystal/ubuntu/bionic/platform.yaml diff --git a/ros2/crystal/ubuntu/bionic/ros-base/Dockerfile b/ros/crystal/ubuntu/bionic/ros-base/Dockerfile similarity index 100% rename from ros2/crystal/ubuntu/bionic/ros-base/Dockerfile rename to ros/crystal/ubuntu/bionic/ros-base/Dockerfile diff --git a/ros2/crystal/ubuntu/bionic/ros-core/Dockerfile b/ros/crystal/ubuntu/bionic/ros-core/Dockerfile similarity index 100% rename from ros2/crystal/ubuntu/bionic/ros-core/Dockerfile rename to ros/crystal/ubuntu/bionic/ros-core/Dockerfile diff --git a/ros2/crystal/ubuntu/bionic/ros-core/ros_entrypoint.sh b/ros/crystal/ubuntu/bionic/ros-core/ros_entrypoint.sh similarity index 100% rename from ros2/crystal/ubuntu/bionic/ros-core/ros_entrypoint.sh rename to ros/crystal/ubuntu/bionic/ros-core/ros_entrypoint.sh diff --git a/ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile similarity index 100% rename from ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile rename to ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile diff --git a/ros2/crystal/ubuntu/bionic/ros1-bridge/hooks/post_push b/ros/crystal/ubuntu/bionic/ros1-bridge/hooks/post_push similarity index 100% rename from ros2/crystal/ubuntu/bionic/ros1-bridge/hooks/post_push rename to ros/crystal/ubuntu/bionic/ros1-bridge/hooks/post_push diff --git a/ros2/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh b/ros/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh similarity index 100% rename from ros2/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh rename to ros/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh diff --git a/ros2/source/Makefile b/ros/source/ros2/Makefile similarity index 100% rename from ros2/source/Makefile rename to ros/source/ros2/Makefile diff --git a/ros2/source/images.yaml.em b/ros/source/ros2/images.yaml.em similarity index 100% rename from ros2/source/images.yaml.em rename to ros/source/ros2/images.yaml.em diff --git a/ros2/source/platform.yaml b/ros/source/ros2/platform.yaml similarity index 100% rename from ros2/source/platform.yaml rename to ros/source/ros2/platform.yaml diff --git a/ros2/source/source/Dockerfile b/ros/source/ros2/source/Dockerfile similarity index 100% rename from ros2/source/source/Dockerfile rename to ros/source/ros2/source/Dockerfile diff --git a/ros2/source/source/ros2_source_entrypoint.sh b/ros/source/ros2/source/ros2_source_entrypoint.sh similarity index 100% rename from ros2/source/source/ros2_source_entrypoint.sh rename to ros/source/ros2/source/ros2_source_entrypoint.sh From eaca344ae304c30254451da89bae328eb65ee385 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 24 Dec 2018 08:38:11 -0800 Subject: [PATCH 25/35] Update comment in template --- ros/melodic/ubuntu/bionic/ros-core/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros/melodic/ubuntu/bionic/ros-core/Dockerfile b/ros/melodic/ubuntu/bionic/ros-core/Dockerfile index 835ce89c9..8b088ca98 100644 --- a/ros/melodic/ubuntu/bionic/ros-core/Dockerfile +++ b/ros/melodic/ubuntu/bionic/ros-core/Dockerfile @@ -2,11 +2,11 @@ # generated from docker_images/create_ros_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 \ From 66b46b1a4e73f5865b0da96adb6509cce7c682c1 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 24 Dec 2018 08:48:00 -0800 Subject: [PATCH 26/35] Merge ros2 config into common ros directory --- ros/manifest.yaml | 127 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 113 insertions(+), 14 deletions(-) diff --git a/ros/manifest.yaml b/ros/manifest.yaml index 37eeed8a4..781cc3aac 100644 --- a/ros/manifest.yaml +++ b/ros/manifest.yaml @@ -11,11 +11,17 @@ defaults: hook_names: post_push: .hooks/legacy/post_push.em - default: &DEFAULT - templates: &DEFAULT_TEMPLATES - images: .config/images.yaml.em - makefile: .config/Makefile.em - platform: .config/platform.yaml.em + default: &DEFAULT_ROS1 + templates: &DEFAULT_TEMPLATES_ROS1 + images: .config/ros1/images.yaml.em + makefile: .config/ros1/Makefile.em + platform: .config/ros1/platform.yaml.em + + default: &DEFAULT_ROS2 + templates: &DEFAULT_TEMPLATES_ROS2 + images: .config/ros2/images.yaml.em + makefile: .config/ros2/Makefile.em + platform: .config/ros2/platform.yaml.em default: &DEFAULT_LEGACY templates: &DEFAULT_TEMPLATES_LEGACY @@ -100,7 +106,7 @@ release_names: ubuntu: os_code_names: trusty: - <<: *DEFAULT + <<: *DEFAULT_ROS1 archs: - amd64 - arm32v7 @@ -128,7 +134,7 @@ release_names: ubuntu: os_code_names: trusty: - <<: *DEFAULT + <<: *DEFAULT_ROS1 archs: - amd64 - arm32v7 @@ -157,7 +163,7 @@ release_names: ubuntu: os_code_names: xenial: - <<: *DEFAULT + <<: *DEFAULT_ROS1 archs: - amd64 - arm32v7 @@ -183,7 +189,7 @@ release_names: debian: os_code_names: jessie: - <<: *DEFAULT + <<: *DEFAULT_ROS1 archs: - amd64 - arm64v8 @@ -207,7 +213,7 @@ release_names: ubuntu: os_code_names: xenial: - <<: *DEFAULT + <<: *DEFAULT_ROS1 archs: - amd64 - arm32v7 @@ -231,7 +237,7 @@ release_names: - "$release_name-perception" - "$release_name-perception-$os_code_name" zesty: - <<: *DEFAULT + <<: *DEFAULT_ROS1 archs: - amd64 tag_names: @@ -251,7 +257,7 @@ release_names: debian: os_code_names: stretch: - <<: *DEFAULT + <<: *DEFAULT_ROS1 archs: - amd64 - arm64v8 @@ -274,7 +280,7 @@ release_names: ubuntu: os_code_names: bionic: - <<: *DEFAULT + <<: *DEFAULT_ROS1 archs: - amd64 - arm32v7 @@ -301,7 +307,7 @@ release_names: debian: os_code_names: stretch: - <<: *DEFAULT + <<: *DEFAULT_ROS1 archs: - amd64 - arm64v8 @@ -318,6 +324,69 @@ release_names: perception: aliases: - "$release_name-perception-$os_code_name" + ardent: + eol: 2018-12 + os_names: + ubuntu: + os_code_names: + xenial: + rosdistro_name: kinetic + <<: *DEFAULT_ROS2 + archs: + - amd64 + - arm64v8 + tag_names: + ros-core: + aliases: + - "$release_name-ros-core" + - "$release_name-ros-core-$os_code_name" + ros-base: + aliases: + - "$release_name-ros-base" + - "$release_name-ros-base-$os_code_name" + - "$release_name" + bouncy: + eol: 2019-07 + os_names: + ubuntu: + os_code_names: + bionic: + rosdistro_name: melodic + <<: *DEFAULT_ROS2 + archs: + - amd64 + - arm64v8 + tag_names: + ros-core: + aliases: + - "$release_name-ros-core" + - "$release_name-ros-core-$os_code_name" + ros-base: + aliases: + - "$release_name-ros-base" + - "$release_name-ros-base-$os_code_name" + - "$release_name" + crystal: + eol: 2019-12 + os_names: + ubuntu: + os_code_names: + bionic: + rosdistro_name: melodic + <<: *DEFAULT_ROS2 + archs: + - amd64 + - arm64v8 + tag_names: + ros-core: + aliases: + - "$release_name-ros-core" + - "$release_name-ros-core-$os_code_name" + ros-base: + aliases: + - "$release_name-ros-base" + - "$release_name-ros-base-$os_code_name" + - "$release_name" meta: maintainers: - Tully Foote (@tfoote) @@ -435,3 +504,33 @@ hacks: <<: *DEFAULT_HOOKS desktop-full: <<: *DEFAULT_HOOKS + ardent: + os_names: + ubuntu: + os_code_names: + xenial: + tag_names: + desktop: + <<: *DEFAULT_HOOKS + ros1-bridge: + <<: *DEFAULT_HOOKS + bouncy: + os_names: + ubuntu: + os_code_names: + bionic: + tag_names: + desktop: + <<: *DEFAULT_HOOKS + ros1-bridge: + <<: *DEFAULT_HOOKS + crystal: + os_names: + ubuntu: + os_code_names: + bionic: + tag_names: + desktop: + <<: *DEFAULT_HOOKS + ros1-bridge: + <<: *DEFAULT_HOOKS From a59739f4a36420d8cc94c77091f49284a8f6ba4f Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 24 Dec 2018 08:49:28 -0800 Subject: [PATCH 27/35] Update desktop and ros1 bridge images to use ros library image and prune installed packages --- ros/.config/ros2/images.yaml.em | 5 ++--- ros/ardent/ubuntu/xenial/desktop/Dockerfile | 2 +- ros/ardent/ubuntu/xenial/images.yaml.em | 5 ++--- ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile | 3 +-- ros/bouncy/ubuntu/bionic/desktop/Dockerfile | 2 +- ros/bouncy/ubuntu/bionic/images.yaml.em | 5 ++--- ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile | 3 +-- ros/crystal/ubuntu/bionic/desktop/Dockerfile | 2 +- ros/crystal/ubuntu/bionic/images.yaml.em | 5 ++--- ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile | 5 ++--- 10 files changed, 15 insertions(+), 22 deletions(-) diff --git a/ros/.config/ros2/images.yaml.em b/ros/.config/ros2/images.yaml.em index 9402c2588..070af3a46 100644 --- a/ros/.config/ros2/images.yaml.em +++ b/ros/.config/ros2/images.yaml.em @@ -22,7 +22,7 @@ images: ros2_packages: - ros-base desktop: - base_image: osrf/@(user_name):@(ros2distro_name)-ros-base + base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) template_name: docker_images_ros2/create_ros_image.Dockerfile.em template_packages: @@ -30,7 +30,7 @@ images: ros2_packages: - desktop ros1-bridge: - base_image: osrf/@(user_name):@(ros2distro_name)-desktop + base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) template_name: docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em entrypoint_name: docker_images_ros2/ros1_bridge_entrypoint.sh @@ -38,4 +38,3 @@ images: - docker_templates ros2_packages: - ros1-bridge - - turtlebot2-demo diff --git a/ros/ardent/ubuntu/xenial/desktop/Dockerfile b/ros/ardent/ubuntu/xenial/desktop/Dockerfile index 85849d1bb..43807e136 100644 --- a/ros/ardent/ubuntu/xenial/desktop/Dockerfile +++ b/ros/ardent/ubuntu/xenial/desktop/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:desktop # generated from docker_images_ros2/create_ros_image.Dockerfile.em -FROM osrf/ros:ardent-ros-base +FROM ros:ardent-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ ros-ardent-desktop=0.4.0-1* \ diff --git a/ros/ardent/ubuntu/xenial/images.yaml.em b/ros/ardent/ubuntu/xenial/images.yaml.em index 9402c2588..070af3a46 100644 --- a/ros/ardent/ubuntu/xenial/images.yaml.em +++ b/ros/ardent/ubuntu/xenial/images.yaml.em @@ -22,7 +22,7 @@ images: ros2_packages: - ros-base desktop: - base_image: osrf/@(user_name):@(ros2distro_name)-ros-base + base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) template_name: docker_images_ros2/create_ros_image.Dockerfile.em template_packages: @@ -30,7 +30,7 @@ images: ros2_packages: - desktop ros1-bridge: - base_image: osrf/@(user_name):@(ros2distro_name)-desktop + base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) template_name: docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em entrypoint_name: docker_images_ros2/ros1_bridge_entrypoint.sh @@ -38,4 +38,3 @@ images: - docker_templates ros2_packages: - ros1-bridge - - turtlebot2-demo diff --git a/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile b/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile index f3574c140..84e62eaf2 100644 --- a/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile +++ b/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:ros1-bridge # generated from docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em -FROM osrf/ros:ardent-desktop +FROM ros:ardent-ros-base # setup keys RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 @@ -13,7 +13,6 @@ ENV ROS2_DISTRO ardent # install ros2 packages RUN apt-get update && apt-get install -y \ 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/ros/bouncy/ubuntu/bionic/desktop/Dockerfile b/ros/bouncy/ubuntu/bionic/desktop/Dockerfile index 4ad459caa..415c48e25 100644 --- a/ros/bouncy/ubuntu/bionic/desktop/Dockerfile +++ b/ros/bouncy/ubuntu/bionic/desktop/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:desktop # generated from docker_images_ros2/create_ros_image.Dockerfile.em -FROM osrf/ros:bouncy-ros-base +FROM ros:bouncy-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ ros-bouncy-desktop=0.5.1-0* \ diff --git a/ros/bouncy/ubuntu/bionic/images.yaml.em b/ros/bouncy/ubuntu/bionic/images.yaml.em index 9402c2588..070af3a46 100644 --- a/ros/bouncy/ubuntu/bionic/images.yaml.em +++ b/ros/bouncy/ubuntu/bionic/images.yaml.em @@ -22,7 +22,7 @@ images: ros2_packages: - ros-base desktop: - base_image: osrf/@(user_name):@(ros2distro_name)-ros-base + base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) template_name: docker_images_ros2/create_ros_image.Dockerfile.em template_packages: @@ -30,7 +30,7 @@ images: ros2_packages: - desktop ros1-bridge: - base_image: osrf/@(user_name):@(ros2distro_name)-desktop + base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) template_name: docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em entrypoint_name: docker_images_ros2/ros1_bridge_entrypoint.sh @@ -38,4 +38,3 @@ images: - docker_templates ros2_packages: - ros1-bridge - - turtlebot2-demo diff --git a/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile index 280350dd9..c6f6ba801 100644 --- a/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:ros1-bridge # generated from docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em -FROM osrf/ros:bouncy-desktop +FROM ros:bouncy-ros-base # setup keys RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 @@ -13,7 +13,6 @@ ENV ROS2_DISTRO bouncy # install ros2 packages RUN apt-get update && apt-get install -y \ 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/ros/crystal/ubuntu/bionic/desktop/Dockerfile b/ros/crystal/ubuntu/bionic/desktop/Dockerfile index 56309ac3c..e7f52e4ec 100644 --- a/ros/crystal/ubuntu/bionic/desktop/Dockerfile +++ b/ros/crystal/ubuntu/bionic/desktop/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:desktop # generated from docker_images_ros2/create_ros_image.Dockerfile.em -FROM osrf/ros:crystal-ros-base +FROM ros:crystal-ros-base # install ros2 packages RUN apt-get update && apt-get install -y \ ros-crystal-desktop=0.6.1-0* \ diff --git a/ros/crystal/ubuntu/bionic/images.yaml.em b/ros/crystal/ubuntu/bionic/images.yaml.em index 9402c2588..070af3a46 100644 --- a/ros/crystal/ubuntu/bionic/images.yaml.em +++ b/ros/crystal/ubuntu/bionic/images.yaml.em @@ -22,7 +22,7 @@ images: ros2_packages: - ros-base desktop: - base_image: osrf/@(user_name):@(ros2distro_name)-ros-base + base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) template_name: docker_images_ros2/create_ros_image.Dockerfile.em template_packages: @@ -30,7 +30,7 @@ images: ros2_packages: - desktop ros1-bridge: - base_image: osrf/@(user_name):@(ros2distro_name)-desktop + base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) template_name: docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em entrypoint_name: docker_images_ros2/ros1_bridge_entrypoint.sh @@ -38,4 +38,3 @@ images: - docker_templates ros2_packages: - ros1-bridge - - turtlebot2-demo diff --git a/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile index 11bb7d2fe..d0916aee5 100644 --- a/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:ros1-bridge # generated from docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em -FROM osrf/ros:crystal-desktop +FROM ros:crystal-ros-base # setup keys RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 @@ -12,8 +12,7 @@ ENV ROS1_DISTRO melodic ENV ROS2_DISTRO crystal # install ros2 packages RUN apt-get update && apt-get install -y \ - ros-crystal-ros1-bridge \ - ros-crystal-turtlebot2-demo \ + ros-crystal-ros1-bridge=0.6.1-0* \ && rm -rf /var/lib/apt/lists/* # setup entrypoint From aea6878bc5cfc5ad427fa1fae146804f0d3cb926 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 24 Dec 2018 09:02:07 -0800 Subject: [PATCH 28/35] Rename ros1 bridge entrypoint name for consistency --- ros/.config/ros2/images.yaml.em | 4 ++-- ros/ardent/ubuntu/xenial/images.yaml.em | 4 ++-- ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile | 6 +++--- .../{ros1_bridge_entrypoint.sh => ros_entrypoint.sh} | 0 ros/bouncy/ubuntu/bionic/images.yaml.em | 4 ++-- ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile | 6 +++--- .../{ros1_bridge_entrypoint.sh => ros_entrypoint.sh} | 0 ros/crystal/ubuntu/bionic/images.yaml.em | 4 ++-- ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile | 6 +++--- .../{ros1_bridge_entrypoint.sh => ros_entrypoint.sh} | 0 10 files changed, 17 insertions(+), 17 deletions(-) rename ros/ardent/ubuntu/xenial/ros1-bridge/{ros1_bridge_entrypoint.sh => ros_entrypoint.sh} (100%) rename ros/bouncy/ubuntu/bionic/ros1-bridge/{ros1_bridge_entrypoint.sh => ros_entrypoint.sh} (100%) rename ros/crystal/ubuntu/bionic/ros1-bridge/{ros1_bridge_entrypoint.sh => ros_entrypoint.sh} (100%) diff --git a/ros/.config/ros2/images.yaml.em b/ros/.config/ros2/images.yaml.em index 070af3a46..de09a6fa4 100644 --- a/ros/.config/ros2/images.yaml.em +++ b/ros/.config/ros2/images.yaml.em @@ -32,8 +32,8 @@ images: ros1-bridge: base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) - template_name: docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em - entrypoint_name: docker_images_ros2/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: diff --git a/ros/ardent/ubuntu/xenial/images.yaml.em b/ros/ardent/ubuntu/xenial/images.yaml.em index 070af3a46..de09a6fa4 100644 --- a/ros/ardent/ubuntu/xenial/images.yaml.em +++ b/ros/ardent/ubuntu/xenial/images.yaml.em @@ -32,8 +32,8 @@ images: ros1-bridge: base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) - template_name: docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em - entrypoint_name: docker_images_ros2/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: diff --git a/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile b/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile index 84e62eaf2..afbc6b35d 100644 --- a/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile +++ b/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros1-bridge -# generated from docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em +# generated from docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em FROM ros:ardent-ros-base # setup keys @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \ && 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"] diff --git a/ros/ardent/ubuntu/xenial/ros1-bridge/ros1_bridge_entrypoint.sh b/ros/ardent/ubuntu/xenial/ros1-bridge/ros_entrypoint.sh similarity index 100% rename from ros/ardent/ubuntu/xenial/ros1-bridge/ros1_bridge_entrypoint.sh rename to ros/ardent/ubuntu/xenial/ros1-bridge/ros_entrypoint.sh diff --git a/ros/bouncy/ubuntu/bionic/images.yaml.em b/ros/bouncy/ubuntu/bionic/images.yaml.em index 070af3a46..de09a6fa4 100644 --- a/ros/bouncy/ubuntu/bionic/images.yaml.em +++ b/ros/bouncy/ubuntu/bionic/images.yaml.em @@ -32,8 +32,8 @@ images: ros1-bridge: base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) - template_name: docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em - entrypoint_name: docker_images_ros2/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: diff --git a/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile index c6f6ba801..50a3b2ef8 100644 --- a/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros1-bridge -# generated from docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em +# generated from docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em FROM ros:bouncy-ros-base # setup keys @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \ && 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"] diff --git a/ros/bouncy/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh b/ros/bouncy/ubuntu/bionic/ros1-bridge/ros_entrypoint.sh similarity index 100% rename from ros/bouncy/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh rename to ros/bouncy/ubuntu/bionic/ros1-bridge/ros_entrypoint.sh diff --git a/ros/crystal/ubuntu/bionic/images.yaml.em b/ros/crystal/ubuntu/bionic/images.yaml.em index 070af3a46..de09a6fa4 100644 --- a/ros/crystal/ubuntu/bionic/images.yaml.em +++ b/ros/crystal/ubuntu/bionic/images.yaml.em @@ -32,8 +32,8 @@ images: ros1-bridge: base_image: @(user_name):@(ros2distro_name)-ros-base maintainer_name: @(maintainer_name) - template_name: docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em - entrypoint_name: docker_images_ros2/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: diff --git a/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile index d0916aee5..0da2ce92b 100644 --- a/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,5 +1,5 @@ # This is an auto generated Dockerfile for ros:ros1-bridge -# generated from docker_images_ros2/create_ros_ros1_bridge_image.Dockerfile.em +# generated from docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em FROM ros:crystal-ros-base # setup keys @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \ && 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"] diff --git a/ros/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh b/ros/crystal/ubuntu/bionic/ros1-bridge/ros_entrypoint.sh similarity index 100% rename from ros/crystal/ubuntu/bionic/ros1-bridge/ros1_bridge_entrypoint.sh rename to ros/crystal/ubuntu/bionic/ros1-bridge/ros_entrypoint.sh From ad31efaa5ae430b2ae272b971eadf546c39febd5 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 24 Dec 2018 09:04:01 -0800 Subject: [PATCH 29/35] Update common manefest to include ros2 images --- ros/ros | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/ros/ros b/ros/ros index c4511ff17..40459dfec 100644 --- a/ros/ros +++ b/ros/ros @@ -113,22 +113,22 @@ Directory: ros/lunar/debian/stretch/perception Tags: melodic-ros-core, melodic-ros-core-bionic Architectures: amd64, arm32v7, arm64v8 -GitCommit: 49d22242e02e9c541a9e85b657e1785617b6f470 +GitCommit: eaca344ae304c30254451da89bae328eb65ee385 Directory: ros/melodic/ubuntu/bionic/ros-core Tags: melodic-ros-base, melodic-ros-base-bionic, melodic, latest Architectures: amd64, arm32v7, arm64v8 -GitCommit: 49d22242e02e9c541a9e85b657e1785617b6f470 +GitCommit: eaca344ae304c30254451da89bae328eb65ee385 Directory: ros/melodic/ubuntu/bionic/ros-base Tags: melodic-robot, melodic-robot-bionic Architectures: amd64, arm32v7, arm64v8 -GitCommit: 49d22242e02e9c541a9e85b657e1785617b6f470 +GitCommit: eaca344ae304c30254451da89bae328eb65ee385 Directory: ros/melodic/ubuntu/bionic/robot Tags: melodic-perception, melodic-perception-bionic Architectures: amd64, arm32v7, arm64v8 -GitCommit: 49d22242e02e9c541a9e85b657e1785617b6f470 +GitCommit: eaca344ae304c30254451da89bae328eb65ee385 Directory: ros/melodic/ubuntu/bionic/perception ######################################## @@ -154,3 +154,54 @@ Architectures: amd64, arm64v8 GitCommit: 49d22242e02e9c541a9e85b657e1785617b6f470 Directory: ros/melodic/debian/stretch/perception + +################################################################################ +# Release: ardent + +######################################## +# Distro: ubuntu:xenial + +Tags: ardent-ros-core, ardent-ros-core-xenial +Architectures: amd64, arm64v8 +GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +Directory: ros/ardent/ubuntu/xenial/ros-core + +Tags: ardent-ros-base, ardent-ros-base-xenial, ardent +Architectures: amd64, arm64v8 +GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +Directory: ros/ardent/ubuntu/xenial/ros-base + + +################################################################################ +# Release: bouncy + +######################################## +# Distro: ubuntu:bionic + +Tags: bouncy-ros-core, bouncy-ros-core-bionic +Architectures: amd64, arm64v8 +GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +Directory: ros/bouncy/ubuntu/bionic/ros-core + +Tags: bouncy-ros-base, bouncy-ros-base-bionic, bouncy +Architectures: amd64, arm64v8 +GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +Directory: ros/bouncy/ubuntu/bionic/ros-base + + +################################################################################ +# Release: crystal + +######################################## +# Distro: ubuntu:bionic + +Tags: crystal-ros-core, crystal-ros-core-bionic +Architectures: amd64, arm64v8 +GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +Directory: ros/crystal/ubuntu/bionic/ros-core + +Tags: crystal-ros-base, crystal-ros-base-bionic, crystal +Architectures: amd64, arm64v8 +GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +Directory: ros/crystal/ubuntu/bionic/ros-base + From e747935a0b29bd4a7b009674bbc162d42dfc5e8c Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 24 Dec 2018 09:04:56 -0800 Subject: [PATCH 30/35] Remove remaining file from old ros2 folder --- ros2/.hooks/post_push.em | 14 ---- ros2/create_dockerfiles.py | 70 -------------------- ros2/create_dockerfolders.py | 31 --------- ros2/create_dockerlibrary.py | 50 --------------- ros2/manifest.yaml | 121 ----------------------------------- ros2/ros2 | 53 --------------- 6 files changed, 339 deletions(-) delete mode 100644 ros2/.hooks/post_push.em delete mode 100755 ros2/create_dockerfiles.py delete mode 100755 ros2/create_dockerfolders.py delete mode 100755 ros2/create_dockerlibrary.py delete mode 100644 ros2/manifest.yaml delete mode 100644 ros2/ros2 diff --git a/ros2/.hooks/post_push.em b/ros2/.hooks/post_push.em deleted file mode 100644 index 82129168c..000000000 --- a/ros2/.hooks/post_push.em +++ /dev/null @@ -1,14 +0,0 @@ -#!/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/create_dockerfiles.py b/ros2/create_dockerfiles.py deleted file mode 100755 index 5e9f6797d..000000000 --- a/ros2/create_dockerfiles.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys -import yaml - -try: - from cStringIO import StringIO -except ImportError: - from io import StringIO -from em import Interpreter - -from docker_templates.argparse import DockerfileArgParser -from docker_templates.create import create_files -from docker_templates.collections import OrderedLoad -from docker_templates.packages import expandPackages - -def main(argv=sys.argv[1:]): - """Create Dockerfiles for images from platform and image yaml data""" - - # Create the top-level parser - parser = DockerfileArgParser( - description="Generate the 'Dockerfile's for the base docker images") - parser.set() - args = parser.parse(argv) - - # Read platform params - with open(args.platform, 'r') as f: - # use safe_load instead load - platform = yaml.safe_load(f)['platform'] - - # Read image params using platform params - images_yaml = StringIO() - try: - interpreter = Interpreter(output=images_yaml) - interpreter.file(open(args.images, 'r'), locals=platform) - images_yaml = images_yaml.getvalue() - except Exception as e: - print("Error processing %s" % args.images) - raise - finally: - interpreter.shutdown() - interpreter = None - # Use ordered dict - images = OrderedLoad(images_yaml, yaml.SafeLoader)['images'] - - # For each image tag - for image in images: - - # Get data for image - data = dict(images[image]) - data['tag_name'] = image - - # Add platform params - data.update(platform) - - # Apply package distro/version formatting - expandPackages(data) - - # Get path to save Docker file - dockerfile_dir = os.path.join(args.output, image) - if not os.path.exists(dockerfile_dir): - os.makedirs(dockerfile_dir) - data['dockerfile_dir'] = dockerfile_dir - - # generate Dockerfile - create_files(data) - -if __name__ == '__main__': - main() diff --git a/ros2/create_dockerfolders.py b/ros2/create_dockerfolders.py deleted file mode 100755 index 58a25635a..000000000 --- a/ros2/create_dockerfolders.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 - -import sys -import yaml - -import create_dockerfiles - -from docker_templates.argparse import DockerfolderArgParser -from docker_templates.collections import OrderedLoad -from docker_templates.folders import populate_paths - - -def main(argv=sys.argv[1:]): - """Create Dockerfolders for images from manafest yaml data""" - - # Create the top-level parser - parser = DockerfolderArgParser( - description="Generate the Dockerfolders for the base docker images") - parser.set() - args = parser.parse(argv) - - # Read manifest params - with open(args.manifest, 'r') as f: - manifest = OrderedLoad(f, yaml.SafeLoader) - - # Populate all paths from the manifest - populate_paths(manifest, args, create_dockerfiles) - - -if __name__ == '__main__': - main() diff --git a/ros2/create_dockerlibrary.py b/ros2/create_dockerlibrary.py deleted file mode 100755 index e3fac7935..000000000 --- a/ros2/create_dockerlibrary.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python3 - -import git -import os -import sys -import yaml - -import ros_buildfarm.templates - -from docker_templates.argparse import DockerlibraryArgParser -from docker_templates.collections import OrderedLoad -from docker_templates.create import expand_template_prefix_path, create_dockerlibrary -from docker_templates.library import parse_manifest - -default_template_prefix_path = ros_buildfarm.templates.template_prefix_path -PWD = os.path.dirname(os.path.abspath(__file__)) - - -def main(argv=sys.argv[1:]): - """Create Dockerlibrary for images from manafest yaml data""" - - # Create the top-level parser - parser = DockerlibraryArgParser( - description="Generate the 'Dockerlibrary for the base docker images") - parser.set() - args = parser.parse(argv) - - # Read manifest params - with open(args.manifest, 'r') as f: - manifest = OrderedLoad(f, yaml.SafeLoader) - - # Create a git diff for the current repo - repo = git.Repo(os.path.join(PWD, '..')) # , odbt=git.GitCmdObjectDB) - - # Parse the manifest - repo_name = os.path.basename(PWD) - manifest = parse_manifest(manifest, repo, repo_name) - - # Flattin manifest data - data = {**manifest, **manifest['meta']} - - # Create Docker Library - template_name = data['template_name'] - template_packages = data['template_packages'] - expand_template_prefix_path(template_packages) - create_dockerlibrary(template_name, data, args.output) - - -if __name__ == '__main__': - main() diff --git a/ros2/manifest.yaml b/ros2/manifest.yaml deleted file mode 100644 index e040f97ae..000000000 --- a/ros2/manifest.yaml +++ /dev/null @@ -1,121 +0,0 @@ -%YAML 1.1 -# ROS2 Dockerfolder manifest ---- -defaults: - - default_hooks: &DEFAULT_HOOKS - hook_names: - post_push: .hooks/post_push.em - - default: &DEFAULT - templates: &DEFAULT_TEMPLATES - images: .config/images.yaml.em - makefile: .config/Makefile.em - platform: .config/platform.yaml.em - -release_names: - ardent: - eol: 2018-12 - os_names: - ubuntu: - os_code_names: - xenial: - rosdistro_name: kinetic - <<: *DEFAULT - archs: - - amd64 - - arm64v8 - tag_names: - ros-core: - aliases: - - "$release_name-ros-core" - - "$release_name-ros-core-$os_code_name" - ros-base: - aliases: - - "$release_name-ros-base" - - "$release_name-ros-base-$os_code_name" - - "$release_name" - bouncy: - eol: 2019-07 - os_names: - ubuntu: - os_code_names: - bionic: - rosdistro_name: melodic - <<: *DEFAULT - archs: - - amd64 - - arm64v8 - tag_names: - ros-core: - aliases: - - "$release_name-ros-core" - - "$release_name-ros-core-$os_code_name" - ros-base: - aliases: - - "$release_name-ros-base" - - "$release_name-ros-base-$os_code_name" - - "$release_name" - crystal: - eol: 2019-12 - os_names: - ubuntu: - os_code_names: - bionic: - rosdistro_name: melodic - <<: *DEFAULT - archs: - - amd64 - - arm64v8 - tag_names: - ros-core: - aliases: - - "$release_name-ros-core" - - "$release_name-ros-core-$os_code_name" - ros-base: - aliases: - - "$release_name-ros-base" - - "$release_name-ros-base-$os_code_name" - - "$release_name" - -meta: - maintainers: - - Tully Foote (@tfoote) - template_name: docker_library/ros2.em - template_packages: - - docker_templates - repo_url: https://github.com/osrf/docker_images.git - - -hacks: - - ardent: - os_names: - ubuntu: - os_code_names: - xenial: - tag_names: - desktop: - <<: *DEFAULT_HOOKS - ros1-bridge: - <<: *DEFAULT_HOOKS - bouncy: - os_names: - ubuntu: - os_code_names: - bionic: - tag_names: - desktop: - <<: *DEFAULT_HOOKS - ros1-bridge: - <<: *DEFAULT_HOOKS - crystal: - os_names: - ubuntu: - os_code_names: - bionic: - tag_names: - desktop: - <<: *DEFAULT_HOOKS - ros1-bridge: - <<: *DEFAULT_HOOKS diff --git a/ros2/ros2 b/ros2/ros2 deleted file mode 100644 index cd48145b7..000000000 --- a/ros2/ros2 +++ /dev/null @@ -1,53 +0,0 @@ -Maintainers: Tully Foote (@tfoote) -GitRepo: https://github.com/osrf/docker_images.git - -################################################################################ -# Release: ardent - -######################################## -# Distro: ubuntu:xenial - -Tags: ardent-ros-core, ardent-ros-core-xenial -Architectures: amd64, arm64v8 -GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 -Directory: ros2/ardent/ubuntu/xenial/ros-core - -Tags: ardent-ros-base, ardent-ros-base-xenial, ardent -Architectures: amd64, arm64v8 -GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 -Directory: ros2/ardent/ubuntu/xenial/ros-base - - -################################################################################ -# Release: bouncy - -######################################## -# Distro: ubuntu:bionic - -Tags: bouncy-ros-core, bouncy-ros-core-bionic -Architectures: amd64, arm64v8 -GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 -Directory: ros2/bouncy/ubuntu/bionic/ros-core - -Tags: bouncy-ros-base, bouncy-ros-base-bionic, bouncy -Architectures: amd64, arm64v8 -GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 -Directory: ros2/bouncy/ubuntu/bionic/ros-base - - -################################################################################ -# Release: crystal - -######################################## -# Distro: ubuntu:bionic - -Tags: crystal-ros-core, crystal-ros-core-bionic -Architectures: amd64, arm64v8 -GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 -Directory: ros2/crystal/ubuntu/bionic/ros-core - -Tags: crystal-ros-base, crystal-ros-base-bionic, crystal -Architectures: amd64, arm64v8 -GitCommit: c5a4ec1ce6516a4000a77c181bbce77bda2d7f66 -Directory: ros2/crystal/ubuntu/bionic/ros-base - From 8146855d1186039c6751520dec2265b2dcd08933 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 28 Dec 2018 19:14:20 -0800 Subject: [PATCH 31/35] Update travis CI for ros2 merge --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 042bfc504..d64e7eeaf 100644 --- a/.travis.yml +++ b/.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 From bb07e11cb22f0ae0eb5f35dc02d6afcba7a95631 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 28 Dec 2018 20:40:01 -0800 Subject: [PATCH 32/35] Update makefiles and template --- ros/.config/ros2/Makefile.em | 24 ++++++++++++------------ ros/ardent/ubuntu/xenial/Makefile | 24 ++++++++++++------------ ros/bouncy/ubuntu/bionic/Makefile | 24 ++++++++++++------------ ros/crystal/ubuntu/bionic/Makefile | 24 ++++++++++++------------ 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/ros/.config/ros2/Makefile.em b/ros/.config/ros2/Makefile.em index 1d70f7dc7..053392807 100644 --- a/ros/.config/ros2/Makefile.em +++ b/ros/.config/ros2/Makefile.em @@ -10,19 +10,19 @@ help: @echo "" build: - @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/. + @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 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 + @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 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 + @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 diff --git a/ros/ardent/ubuntu/xenial/Makefile b/ros/ardent/ubuntu/xenial/Makefile index 36e85fe78..7ed9586b5 100644 --- a/ros/ardent/ubuntu/xenial/Makefile +++ b/ros/ardent/ubuntu/xenial/Makefile @@ -10,19 +10,19 @@ help: @echo "" build: - @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/. + @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 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 + @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 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 + @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 diff --git a/ros/bouncy/ubuntu/bionic/Makefile b/ros/bouncy/ubuntu/bionic/Makefile index 4944569cd..19eb9735c 100644 --- a/ros/bouncy/ubuntu/bionic/Makefile +++ b/ros/bouncy/ubuntu/bionic/Makefile @@ -10,19 +10,19 @@ help: @echo "" build: - @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/. + @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 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 + @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 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 + @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 diff --git a/ros/crystal/ubuntu/bionic/Makefile b/ros/crystal/ubuntu/bionic/Makefile index eb0496cad..e59cbc47d 100644 --- a/ros/crystal/ubuntu/bionic/Makefile +++ b/ros/crystal/ubuntu/bionic/Makefile @@ -10,19 +10,19 @@ help: @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/. + @docker build --tag=ros:crystal-ros-core-bionic ros-core/. + @docker build --tag=ros:crystal-ros-base-bionic ros-base/. + # @docker build --tag=osrf/ros:crystal-desktop-bionic desktop/. + # @docker build --tag=osrf/ros: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 + @docker pull ros:crystal-ros-core-bionic + @docker pull ros:crystal-ros-base-bionic + # @docker pull osrf/ros:crystal-desktop-bionic + # @docker pull osrf/ros: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 + @docker rmi -f ros:crystal-ros-core-bionic + @docker rmi -f ros:crystal-ros-base-bionic + # @docker rmi -f osrf/ros:crystal-desktop-bionic + # @docker rmi -f osrf/ros:crystal-ros1-bridge-bionic From 9619e8b2fedc763707c07bd5568f2401bfc5b117 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 28 Dec 2018 20:54:49 -0800 Subject: [PATCH 33/35] Fix Dockerfiles to build from tags including os_code_name --- ros/.config/ros2/images.yaml.em | 6 +++--- ros/ardent/ubuntu/xenial/desktop/Dockerfile | 2 +- ros/ardent/ubuntu/xenial/images.yaml.em | 6 +++--- ros/ardent/ubuntu/xenial/ros-base/Dockerfile | 2 +- ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile | 2 +- ros/bouncy/ubuntu/bionic/desktop/Dockerfile | 2 +- ros/bouncy/ubuntu/bionic/images.yaml.em | 6 +++--- ros/bouncy/ubuntu/bionic/ros-base/Dockerfile | 2 +- ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile | 2 +- ros/crystal/ubuntu/bionic/desktop/Dockerfile | 2 +- ros/crystal/ubuntu/bionic/images.yaml.em | 6 +++--- ros/crystal/ubuntu/bionic/ros-base/Dockerfile | 2 +- ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ros/.config/ros2/images.yaml.em b/ros/.config/ros2/images.yaml.em index de09a6fa4..64d99718a 100644 --- a/ros/.config/ros2/images.yaml.em +++ b/ros/.config/ros2/images.yaml.em @@ -14,7 +14,7 @@ images: ros2_packages: - ros-core ros-base: - base_image: @(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_ros2/create_ros_image.Dockerfile.em template_packages: @@ -22,7 +22,7 @@ images: ros2_packages: - ros-base desktop: - base_image: @(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_ros2/create_ros_image.Dockerfile.em template_packages: @@ -30,7 +30,7 @@ images: ros2_packages: - desktop ros1-bridge: - base_image: @(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_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em entrypoint_name: docker_images_ros2/ros1_bridge/ros_entrypoint.sh diff --git a/ros/ardent/ubuntu/xenial/desktop/Dockerfile b/ros/ardent/ubuntu/xenial/desktop/Dockerfile index 43807e136..dd90288ac 100644 --- a/ros/ardent/ubuntu/xenial/desktop/Dockerfile +++ b/ros/ardent/ubuntu/xenial/desktop/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:desktop # generated from docker_images_ros2/create_ros_image.Dockerfile.em -FROM ros:ardent-ros-base +FROM ros:ardent-ros-base-xenial # install ros2 packages RUN apt-get update && apt-get install -y \ ros-ardent-desktop=0.4.0-1* \ diff --git a/ros/ardent/ubuntu/xenial/images.yaml.em b/ros/ardent/ubuntu/xenial/images.yaml.em index de09a6fa4..64d99718a 100644 --- a/ros/ardent/ubuntu/xenial/images.yaml.em +++ b/ros/ardent/ubuntu/xenial/images.yaml.em @@ -14,7 +14,7 @@ images: ros2_packages: - ros-core ros-base: - base_image: @(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_ros2/create_ros_image.Dockerfile.em template_packages: @@ -22,7 +22,7 @@ images: ros2_packages: - ros-base desktop: - base_image: @(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_ros2/create_ros_image.Dockerfile.em template_packages: @@ -30,7 +30,7 @@ images: ros2_packages: - desktop ros1-bridge: - base_image: @(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_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em entrypoint_name: docker_images_ros2/ros1_bridge/ros_entrypoint.sh diff --git a/ros/ardent/ubuntu/xenial/ros-base/Dockerfile b/ros/ardent/ubuntu/xenial/ros-base/Dockerfile index dc0ab10dd..be76aba76 100644 --- a/ros/ardent/ubuntu/xenial/ros-base/Dockerfile +++ b/ros/ardent/ubuntu/xenial/ros-base/Dockerfile @@ -1,6 +1,6 @@ # 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 +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* \ diff --git a/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile b/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile index afbc6b35d..ce694e659 100644 --- a/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile +++ b/ros/ardent/ubuntu/xenial/ros1-bridge/Dockerfile @@ -1,6 +1,6 @@ # 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 +FROM ros:ardent-ros-base-xenial # setup keys RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 diff --git a/ros/bouncy/ubuntu/bionic/desktop/Dockerfile b/ros/bouncy/ubuntu/bionic/desktop/Dockerfile index 415c48e25..718120f20 100644 --- a/ros/bouncy/ubuntu/bionic/desktop/Dockerfile +++ b/ros/bouncy/ubuntu/bionic/desktop/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:desktop # generated from docker_images_ros2/create_ros_image.Dockerfile.em -FROM ros:bouncy-ros-base +FROM ros:bouncy-ros-base-bionic # install ros2 packages RUN apt-get update && apt-get install -y \ ros-bouncy-desktop=0.5.1-0* \ diff --git a/ros/bouncy/ubuntu/bionic/images.yaml.em b/ros/bouncy/ubuntu/bionic/images.yaml.em index de09a6fa4..64d99718a 100644 --- a/ros/bouncy/ubuntu/bionic/images.yaml.em +++ b/ros/bouncy/ubuntu/bionic/images.yaml.em @@ -14,7 +14,7 @@ images: ros2_packages: - ros-core ros-base: - base_image: @(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_ros2/create_ros_image.Dockerfile.em template_packages: @@ -22,7 +22,7 @@ images: ros2_packages: - ros-base desktop: - base_image: @(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_ros2/create_ros_image.Dockerfile.em template_packages: @@ -30,7 +30,7 @@ images: ros2_packages: - desktop ros1-bridge: - base_image: @(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_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em entrypoint_name: docker_images_ros2/ros1_bridge/ros_entrypoint.sh diff --git a/ros/bouncy/ubuntu/bionic/ros-base/Dockerfile b/ros/bouncy/ubuntu/bionic/ros-base/Dockerfile index 1ae375213..d1b945f4e 100644 --- a/ros/bouncy/ubuntu/bionic/ros-base/Dockerfile +++ b/ros/bouncy/ubuntu/bionic/ros-base/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:ros-base # generated from docker_images_ros2/create_ros_image.Dockerfile.em -FROM ros:bouncy-ros-core +FROM ros:bouncy-ros-core-bionic # install ros2 packages RUN apt-get update && apt-get install -y \ ros-bouncy-ros-base=0.5.1-0* \ diff --git a/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile index 50a3b2ef8..a4a86b02a 100644 --- a/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros/bouncy/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,6 +1,6 @@ # 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:bouncy-ros-base +FROM ros:bouncy-ros-base-bionic # setup keys RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 diff --git a/ros/crystal/ubuntu/bionic/desktop/Dockerfile b/ros/crystal/ubuntu/bionic/desktop/Dockerfile index e7f52e4ec..4b06a1233 100644 --- a/ros/crystal/ubuntu/bionic/desktop/Dockerfile +++ b/ros/crystal/ubuntu/bionic/desktop/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:desktop # generated from docker_images_ros2/create_ros_image.Dockerfile.em -FROM ros:crystal-ros-base +FROM ros:crystal-ros-base-bionic # install ros2 packages RUN apt-get update && apt-get install -y \ ros-crystal-desktop=0.6.1-0* \ diff --git a/ros/crystal/ubuntu/bionic/images.yaml.em b/ros/crystal/ubuntu/bionic/images.yaml.em index de09a6fa4..64d99718a 100644 --- a/ros/crystal/ubuntu/bionic/images.yaml.em +++ b/ros/crystal/ubuntu/bionic/images.yaml.em @@ -14,7 +14,7 @@ images: ros2_packages: - ros-core ros-base: - base_image: @(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_ros2/create_ros_image.Dockerfile.em template_packages: @@ -22,7 +22,7 @@ images: ros2_packages: - ros-base desktop: - base_image: @(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_ros2/create_ros_image.Dockerfile.em template_packages: @@ -30,7 +30,7 @@ images: ros2_packages: - desktop ros1-bridge: - base_image: @(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_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em entrypoint_name: docker_images_ros2/ros1_bridge/ros_entrypoint.sh diff --git a/ros/crystal/ubuntu/bionic/ros-base/Dockerfile b/ros/crystal/ubuntu/bionic/ros-base/Dockerfile index f80be072b..84a4db5a4 100644 --- a/ros/crystal/ubuntu/bionic/ros-base/Dockerfile +++ b/ros/crystal/ubuntu/bionic/ros-base/Dockerfile @@ -1,6 +1,6 @@ # This is an auto generated Dockerfile for ros:ros-base # generated from docker_images_ros2/create_ros_image.Dockerfile.em -FROM ros:crystal-ros-core +FROM ros:crystal-ros-core-bionic # install ros2 packages RUN apt-get update && apt-get install -y \ ros-crystal-ros-base=0.6.1-0* \ diff --git a/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile index 0da2ce92b..ed678bd60 100644 --- a/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros/crystal/ubuntu/bionic/ros1-bridge/Dockerfile @@ -1,6 +1,6 @@ # 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:crystal-ros-base +FROM ros:crystal-ros-base-bionic # setup keys RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 From d5241ac6bbdc1e6f64e304bcd0dc91caa2a925a0 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 28 Dec 2018 21:43:44 -0800 Subject: [PATCH 34/35] Update manifest --- ros/ros | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ros/ros b/ros/ros index 40459dfec..ac84e92b8 100644 --- a/ros/ros +++ b/ros/ros @@ -163,12 +163,12 @@ Directory: ros/melodic/debian/stretch/perception Tags: ardent-ros-core, ardent-ros-core-xenial Architectures: amd64, arm64v8 -GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +GitCommit: 9619e8b2fedc763707c07bd5568f2401bfc5b117 Directory: ros/ardent/ubuntu/xenial/ros-core Tags: ardent-ros-base, ardent-ros-base-xenial, ardent Architectures: amd64, arm64v8 -GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +GitCommit: 9619e8b2fedc763707c07bd5568f2401bfc5b117 Directory: ros/ardent/ubuntu/xenial/ros-base @@ -180,12 +180,12 @@ Directory: ros/ardent/ubuntu/xenial/ros-base Tags: bouncy-ros-core, bouncy-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +GitCommit: 9619e8b2fedc763707c07bd5568f2401bfc5b117 Directory: ros/bouncy/ubuntu/bionic/ros-core Tags: bouncy-ros-base, bouncy-ros-base-bionic, bouncy Architectures: amd64, arm64v8 -GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +GitCommit: 9619e8b2fedc763707c07bd5568f2401bfc5b117 Directory: ros/bouncy/ubuntu/bionic/ros-base @@ -197,11 +197,11 @@ Directory: ros/bouncy/ubuntu/bionic/ros-base Tags: crystal-ros-core, crystal-ros-core-bionic Architectures: amd64, arm64v8 -GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +GitCommit: 9619e8b2fedc763707c07bd5568f2401bfc5b117 Directory: ros/crystal/ubuntu/bionic/ros-core Tags: crystal-ros-base, crystal-ros-base-bionic, crystal Architectures: amd64, arm64v8 -GitCommit: aea6878bc5cfc5ad427fa1fae146804f0d3cb926 +GitCommit: 9619e8b2fedc763707c07bd5568f2401bfc5b117 Directory: ros/crystal/ubuntu/bionic/ros-base From 56c98f7b1d94d8c813ae417b9022a22636be5ea4 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 3 Jan 2019 09:49:53 -0800 Subject: [PATCH 35/35] Restructure ros2 source templates --- ros/source/ros2/images.yaml.em | 4 ++-- ros/source/ros2/source/Dockerfile | 11 +++++------ .../{ros2_source_entrypoint.sh => ros_entrypoint.sh} | 0 3 files changed, 7 insertions(+), 8 deletions(-) rename ros/source/ros2/source/{ros2_source_entrypoint.sh => ros_entrypoint.sh} (100%) diff --git a/ros/source/ros2/images.yaml.em b/ros/source/ros2/images.yaml.em index c6a17af49..edf37590f 100644 --- a/ros/source/ros2/images.yaml.em +++ b/ros/source/ros2/images.yaml.em @@ -5,8 +5,8 @@ images: source: base_image: @(os_name):@(os_code_name) maintainer_name: @(maintainer_name) - template_name: docker_images/create_ros2_source_image.Dockerfile.em - entrypoint_name: docker_images/ros2_source_entrypoint.sh + template_name: docker_images_ros2/source/create_ros_image.Dockerfile.em + entrypoint_name: docker_images_ros2/source/ros_entrypoint.sh template_packages: - docker_templates upstream_packages: diff --git a/ros/source/ros2/source/Dockerfile b/ros/source/ros2/source/Dockerfile index ef649e5d2..96810c135 100644 --- a/ros/source/ros2/source/Dockerfile +++ b/ros/source/ros2/source/Dockerfile @@ -1,12 +1,12 @@ # This is an auto generated Dockerfile for ros2:source -# generated from docker_images/create_ros2_source_image.Dockerfile.em +# generated from docker_images_ros2/source/create_ros_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 \ bash-completion \ @@ -24,8 +24,7 @@ RUN apt-get update && apt-get install -q -y \ 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 +RUN echo "deb http://packages.ros.org/ros2/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros2-latest.list # setup environment ENV LANG C.UTF-8 @@ -85,7 +84,7 @@ RUN colcon \ RUN cp /etc/skel/.bashrc ~/ # setup entrypoint -COPY ./ros2_source_entrypoint.sh / +COPY ./ros_entrypoint.sh / -ENTRYPOINT ["/ros2_source_entrypoint.sh"] +ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["bash"] diff --git a/ros/source/ros2/source/ros2_source_entrypoint.sh b/ros/source/ros2/source/ros_entrypoint.sh similarity index 100% rename from ros/source/ros2/source/ros2_source_entrypoint.sh rename to ros/source/ros2/source/ros_entrypoint.sh