[ros] pass --rosdistro explicitly to rosdep #7408
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Diff:diff --git a/ros_dashing-ros-core-bionic/Dockerfile b/ros_dashing-ros-core-bionic/Dockerfile
index 7b8600c..2c6c83b 100644
--- a/ros_dashing-ros-core-bionic/Dockerfile
+++ b/ros_dashing-ros-core-bionic/Dockerfile
@@ -33,9 +33,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
+ENV ROS_DISTRO dashing
# bootstrap rosdep
-RUN rosdep init \
- && rosdep update
+RUN rosdep init && \
+ rosdep update --rosdistro $ROS_DISTRO
# setup colcon mixin and metadata
RUN colcon mixin add default \
@@ -50,7 +51,6 @@ RUN pip3 install -U \
argcomplete
# install ros2 packages
-ENV ROS_DISTRO dashing
RUN apt-get update && apt-get install -y \
ros-dashing-ros-core=0.7.3-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_eloquent-ros-core-bionic/Dockerfile b/ros_eloquent-ros-core-bionic/Dockerfile
index 2bb750f..ebeb85e 100644
--- a/ros_eloquent-ros-core-bionic/Dockerfile
+++ b/ros_eloquent-ros-core-bionic/Dockerfile
@@ -33,9 +33,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
+ENV ROS_DISTRO eloquent
# bootstrap rosdep
-RUN rosdep init \
- && rosdep update
+RUN rosdep init && \
+ rosdep update --rosdistro $ROS_DISTRO
# setup colcon mixin and metadata
RUN colcon mixin add default \
@@ -50,7 +51,6 @@ RUN pip3 install -U \
argcomplete
# install ros2 packages
-ENV ROS_DISTRO eloquent
RUN apt-get update && apt-get install -y \
ros-eloquent-ros-core=0.8.4-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_kinetic-ros-core-xenial/Dockerfile b/ros_kinetic-ros-core-xenial/Dockerfile
index 08a7145..0c98e14 100644
--- a/ros_kinetic-ros-core-xenial/Dockerfile
+++ b/ros_kinetic-ros-core-xenial/Dockerfile
@@ -25,12 +25,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
+ENV ROS_DISTRO kinetic
# bootstrap rosdep
-RUN rosdep init \
- && rosdep update
+RUN rosdep init && \
+ rosdep update --rosdistro $ROS_DISTRO
# install ros packages
-ENV ROS_DISTRO kinetic
RUN apt-get update && apt-get install -y \
ros-kinetic-ros-core=1.3.2-0* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_melodic-ros-core-bionic/Dockerfile b/ros_melodic-ros-core-bionic/Dockerfile
index fa5b7b9..2181e02 100644
--- a/ros_melodic-ros-core-bionic/Dockerfile
+++ b/ros_melodic-ros-core-bionic/Dockerfile
@@ -30,12 +30,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
+ENV ROS_DISTRO melodic
# bootstrap rosdep
-RUN rosdep init \
- && rosdep update
+RUN rosdep init && \
+ rosdep update --rosdistro $ROS_DISTRO
# install ros packages
-ENV ROS_DISTRO melodic
RUN apt-get update && apt-get install -y \
ros-melodic-ros-core=1.4.1-0* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_melodic-ros-core-stretch/Dockerfile b/ros_melodic-ros-core-stretch/Dockerfile
index e03a4b3..7592f39 100644
--- a/ros_melodic-ros-core-stretch/Dockerfile
+++ b/ros_melodic-ros-core-stretch/Dockerfile
@@ -25,12 +25,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
+ENV ROS_DISTRO melodic
# bootstrap rosdep
-RUN rosdep init \
- && rosdep update
+RUN rosdep init && \
+ rosdep update --rosdistro $ROS_DISTRO
# install ros packages
-ENV ROS_DISTRO melodic
RUN apt-get update && apt-get install -y \
ros-melodic-ros-core=1.4.1-0* \
&& rm -rf /var/lib/apt/lists/* |
|
Build test of #7408; b03f7da; $ bashbrew build ros:kinetic-ros-core
Building bashbrew/cache:cec0cccfa129edb36eda7b572dba3f01a29b377edabfd680699cac78b51b7d2a (ros:kinetic-ros-core)
Tagging ros:kinetic-ros-core
Tagging ros:kinetic-ros-core-xenial
$ test/run.sh ros:kinetic-ros-core
testing ros:kinetic-ros-core
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:kinetic-ros-base
Building bashbrew/cache:0ca489b979eb8aa5c2dea8a3bbaebb23a86948eae4540df371589a9506bdc041 (ros:kinetic-ros-base)
Tagging ros:kinetic-ros-base
Tagging ros:kinetic-ros-base-xenial
Tagging ros:kinetic
$ test/run.sh ros:kinetic-ros-base
testing ros:kinetic-ros-base
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:kinetic-robot
Building bashbrew/cache:c8cd2b4e3b414e13ac634cdea7a4fca3cb1ff60900d83ce03ee72674ecf7983d (ros:kinetic-robot)
Tagging ros:kinetic-robot
Tagging ros:kinetic-robot-xenial
$ test/run.sh ros:kinetic-robot
testing ros:kinetic-robot
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:kinetic-perception
Building bashbrew/cache:790e616d14e713c0f77aaaf265e86dd4a43697d94f2b950fb5eb9374c39a5c3a (ros:kinetic-perception)
Tagging ros:kinetic-perception
Tagging ros:kinetic-perception-xenial
$ test/run.sh ros:kinetic-perception
testing ros:kinetic-perception
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:melodic-ros-core
Building bashbrew/cache:3c77157a4014fb4ff1ee61808ea858a17e61f1be3d26af32009ec8b3a7aba757 (ros:melodic-ros-core)
Tagging ros:melodic-ros-core
Tagging ros:melodic-ros-core-bionic
$ test/run.sh ros:melodic-ros-core
testing ros:melodic-ros-core
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:melodic-ros-base
Building bashbrew/cache:77018d42f8aca892904f4e24b8e2e2ef1a2e294d9e5d3d1284c8d889b29b35f7 (ros:melodic-ros-base)
Tagging ros:melodic-ros-base
Tagging ros:melodic-ros-base-bionic
Tagging ros:melodic
Tagging ros:latest
$ test/run.sh ros:melodic-ros-base
testing ros:melodic-ros-base
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:melodic-robot
Building bashbrew/cache:f224cb2901a294265466918c8b7448379424d0588b2be2b164fc9a8b692d7f0a (ros:melodic-robot)
Tagging ros:melodic-robot
Tagging ros:melodic-robot-bionic
$ test/run.sh ros:melodic-robot
testing ros:melodic-robot
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:melodic-perception
Building bashbrew/cache:91d1ed2453b198115a5bdc5425886f6b855ccb8f4cfd6a7d6668216990ad0912 (ros:melodic-perception)
Tagging ros:melodic-perception
Tagging ros:melodic-perception-bionic
$ test/run.sh ros:melodic-perception
testing ros:melodic-perception
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:melodic-ros-core-stretch
Building bashbrew/cache:59902994819a0076f811a040aacd0cddf967348d445afa8d2cff046414e4d0aa (ros:melodic-ros-core-stretch)
Tagging ros:melodic-ros-core-stretch
$ test/run.sh ros:melodic-ros-core-stretch
testing ros:melodic-ros-core-stretch
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:melodic-ros-base-stretch
Building bashbrew/cache:4b346a57b3629fce569787bc83719675f5b1b16ad1b5c9208bb9ad5abff13e25 (ros:melodic-ros-base-stretch)
Tagging ros:melodic-ros-base-stretch
$ test/run.sh ros:melodic-ros-base-stretch
testing ros:melodic-ros-base-stretch
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:melodic-robot-stretch
Building bashbrew/cache:1f72ffc895b6b196622c4bc314b846ad0b533eceddfd4deac870a8691043970f (ros:melodic-robot-stretch)
Tagging ros:melodic-robot-stretch
$ test/run.sh ros:melodic-robot-stretch
testing ros:melodic-robot-stretch
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:melodic-perception-stretch
Building bashbrew/cache:8cfe1dc8dd8cbc278e6c6ca2b8e0fcb6479dfe2715629c83916f40e40539d828 (ros:melodic-perception-stretch)
Tagging ros:melodic-perception-stretch
$ test/run.sh ros:melodic-perception-stretch
testing ros:melodic-perception-stretch
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:dashing-ros-core
Building bashbrew/cache:798727b0632abfe38114060d66a9763302fbc1d88cac415332a256cc996c8011 (ros:dashing-ros-core)
Tagging ros:dashing-ros-core
Tagging ros:dashing-ros-core-bionic
$ test/run.sh ros:dashing-ros-core
testing ros:dashing-ros-core
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:dashing-ros-base
Building bashbrew/cache:519285b7d720270fd34f85cbf99a172b1fc7b5e0cfa0a786e893bbfd657f3f2d (ros:dashing-ros-base)
Tagging ros:dashing-ros-base
Tagging ros:dashing-ros-base-bionic
Tagging ros:dashing
$ test/run.sh ros:dashing-ros-base
testing ros:dashing-ros-base
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:eloquent-ros-core
Building bashbrew/cache:ed1f7bb0d2a82b55acb75b831a14bea6bc41f2324f3f939ccafc0aa05e832dd1 (ros:eloquent-ros-core)
Tagging ros:eloquent-ros-core
Tagging ros:eloquent-ros-core-bionic
$ test/run.sh ros:eloquent-ros-core
testing ros:eloquent-ros-core
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build ros:eloquent-ros-base
Building bashbrew/cache:9d0071b66add3c55f0278a33c61debb7bba5ce65b2979239afacd89253eca2ae (ros:eloquent-ros-base)
Tagging ros:eloquent-ros-base
Tagging ros:eloquent-ros-base-bionic
Tagging ros:eloquent
$ test/run.sh ros:eloquent-ros-base
testing ros:eloquent-ros-base
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This modifies all the
ros-coretags to pass an extra argument to therosdep updateinvocationThe other commit hash changes point to more accurate commits but the content of the dockefiles is the same.
Book-keeping:
Related to: osrf/docker_templates#83 and osrf/docker_images#351