Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ROS] Template update, reintegrate with ros/rosdistro repo #5280

Merged
merged 1 commit into from
Jan 11, 2019

Conversation

ruffsl
Copy link
Contributor

@ruffsl ruffsl commented Jan 11, 2019

@tianon
Copy link
Member

tianon commented Jan 11, 2019

Diff:
diff --git a/ros_ardent-ros-core-xenial/Dockerfile b/ros_ardent-ros-core-xenial/Dockerfile
index 002bb99..7336c80 100644
--- a/ros_ardent-ros-core-xenial/Dockerfile
+++ b/ros_ardent-ros-core-xenial/Dockerfile
@@ -28,7 +28,6 @@ ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
 # bootstrap rosdep
-ENV ROSDISTRO_INDEX_URL https://raw.githubusercontent.com/ros2/rosdistro/ros2/index.yaml
 RUN rosdep init \
     && rosdep update
 
diff --git a/ros_bouncy-ros-core-bionic/Dockerfile b/ros_bouncy-ros-core-bionic/Dockerfile
index a880f4e..467261a 100644
--- a/ros_bouncy-ros-core-bionic/Dockerfile
+++ b/ros_bouncy-ros-core-bionic/Dockerfile
@@ -33,7 +33,6 @@ ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
 # bootstrap rosdep
-ENV ROSDISTRO_INDEX_URL https://raw.githubusercontent.com/ros2/rosdistro/ros2/index.yaml
 RUN rosdep init \
     && rosdep update
 
diff --git a/ros_crystal-ros-core-bionic/Dockerfile b/ros_crystal-ros-core-bionic/Dockerfile
index 43ca899..629d360 100644
--- a/ros_crystal-ros-core-bionic/Dockerfile
+++ b/ros_crystal-ros-core-bionic/Dockerfile
@@ -33,7 +33,6 @@ ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
 # bootstrap rosdep
-ENV ROSDISTRO_INDEX_URL https://raw.githubusercontent.com/ros2/rosdistro/ros2/index.yaml
 RUN rosdep init \
     && rosdep update
 

@tianon
Copy link
Member

tianon commented Jan 11, 2019

LGTM

Build test of #5280; b4e6741; amd64 (ros):

$ bashbrew build ros:indigo-ros-core
Using bashbrew/cache:edbf7e3eaf75f4a77f4fab3239ff3168148c6b2841f3dd312428783d619370bb (ros:indigo-ros-core)
Tagging ros:indigo-ros-core
Tagging ros:indigo-ros-core-trusty

$ test/run.sh ros:indigo-ros-core
testing ros:indigo-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:indigo-ros-base
Using bashbrew/cache:b3b9d042a1da9b914893c10f6b8a0952f6051f59032e2f208bddd26cec8de800 (ros:indigo-ros-base)
Tagging ros:indigo-ros-base
Tagging ros:indigo-ros-base-trusty
Tagging ros:indigo

$ test/run.sh ros:indigo-ros-base
testing ros:indigo-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:indigo-robot
Using bashbrew/cache:8bbc069b8c4612c715ac2ed0881030520f3cf5966a13ddfef9ec22e6908bfe0a (ros:indigo-robot)
Tagging ros:indigo-robot
Tagging ros:indigo-robot-trusty

$ test/run.sh ros:indigo-robot
testing ros:indigo-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:indigo-perception
Using bashbrew/cache:29e8dedebd00047310ca13735391332218ac266b059911fd263c0ea5248fcf44 (ros:indigo-perception)
Tagging ros:indigo-perception
Tagging ros:indigo-perception-trusty

$ test/run.sh ros:indigo-perception
testing ros:indigo-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:kinetic-ros-core
Using bashbrew/cache:c5431a7eabbd9f322f3ae819d2329682d88bce292075bef3942cb4d6eb4da2c4 (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
Using bashbrew/cache:f8f167c37f0918a0ac740317696d1143dca9c19aba3481dd29a3d7ffb9af46ea (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
Using bashbrew/cache:c8f59abf911c13e992aef43ebfa8471343811616f8cd82980bd487b795884d6f (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
Using bashbrew/cache:f2004087d3bd8186facf71e28e88c8ae18d00c8078f1787f90a466f8eede6f04 (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:lunar-ros-core
Using bashbrew/cache:4171e2066d274ee4071a3f16eec6082cc69fe84824fd037f0e7d738a6a1dc241 (ros:lunar-ros-core)
Tagging ros:lunar-ros-core
Tagging ros:lunar-ros-core-xenial

$ test/run.sh ros:lunar-ros-core
testing ros:lunar-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:lunar-ros-base
Using bashbrew/cache:77bd32ba9213e44e6a6da42c627ab430933bd1ad73c44cea16dacfafeed31f71 (ros:lunar-ros-base)
Tagging ros:lunar-ros-base
Tagging ros:lunar-ros-base-xenial
Tagging ros:lunar

$ test/run.sh ros:lunar-ros-base
testing ros:lunar-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:lunar-robot
Using bashbrew/cache:bc758b19f72fca27dd4f5374ad18e6c20a99d9aa5b39dcdc015582a2112dc19d (ros:lunar-robot)
Tagging ros:lunar-robot
Tagging ros:lunar-robot-xenial

$ test/run.sh ros:lunar-robot
testing ros:lunar-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:lunar-perception
Using bashbrew/cache:0530e66afe56bbc1eef09927cda52c66ae17211f07e71ce45da3d9dd63798688 (ros:lunar-perception)
Tagging ros:lunar-perception
Tagging ros:lunar-perception-xenial

$ test/run.sh ros:lunar-perception
testing ros:lunar-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:lunar-ros-core-stretch
Using bashbrew/cache:024ff60572e07466b5835764cadac64be9d58ac9bd1082f5a1b0449cf86c847b (ros:lunar-ros-core-stretch)
Tagging ros:lunar-ros-core-stretch

$ test/run.sh ros:lunar-ros-core-stretch
testing ros:lunar-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:lunar-ros-base-stretch
Using bashbrew/cache:e8c26b8bb943df8bfef867bf275503496b4359cc378ae788637e6e4f2649939a (ros:lunar-ros-base-stretch)
Tagging ros:lunar-ros-base-stretch

$ test/run.sh ros:lunar-ros-base-stretch
testing ros:lunar-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:lunar-robot-stretch
Using bashbrew/cache:fe9e7056cf155112c99f1e5fb6b6409fe299784c0fa128f58615a6298aff113e (ros:lunar-robot-stretch)
Tagging ros:lunar-robot-stretch

$ test/run.sh ros:lunar-robot-stretch
testing ros:lunar-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:lunar-perception-stretch
Using bashbrew/cache:4912162a3ae747cd0a4282859857c34b08e604f36490f1826d8efb6163cbd74d (ros:lunar-perception-stretch)
Tagging ros:lunar-perception-stretch

$ test/run.sh ros:lunar-perception-stretch
testing ros:lunar-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:melodic-ros-core
Using bashbrew/cache:295116d560f48afdad8e2f096f595f8b7a17e268e654c14c7445714125f3fb4d (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
Using bashbrew/cache:561e8703ea201bc6ad266eb1cfdd9f86cb1d0a542e49f4868df08890956d6a7b (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
Using bashbrew/cache:d377afdce345096a62643390a6162c5ca365b6bbcac1c9500a9762f4e0e3315a (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
Using bashbrew/cache:5ba103db5e85dd200521d5d1f4366c25badbb0fb26ba219d48411ad39ef724e6 (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
Using bashbrew/cache:10c74bd74e8205b482560cb0335b22cc1084e545d19faba6b9e610586d3861c2 (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
Using bashbrew/cache:fd188cb58c348d39b2eec22f33d1e3a7ebfbcb6867b6c63aad9bda41446a8d6c (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
Using bashbrew/cache:8f82dead16b66eeb266b76a83f0e731b37e903c489cb055eb007a07038c61f3f (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
Using bashbrew/cache:ad3d6bbf8bbc4324a8692cde46cb217e77b55ee761ad24b64ad3e29e51bf7952 (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:ardent-ros-core
Building bashbrew/cache:bb74d9a2937d294776b13f2fc333c7994a1bcd419fdc78b2af70f34cabd8e0ea (ros:ardent-ros-core)
Tagging ros:ardent-ros-core
Tagging ros:ardent-ros-core-xenial

$ test/run.sh ros:ardent-ros-core
testing ros:ardent-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:ardent-ros-base
Building bashbrew/cache:563270a1af9bb66111d272d2b85e82e6eef818fa35dd9b74144d0aa5faddcdfb (ros:ardent-ros-base)
Tagging ros:ardent-ros-base
Tagging ros:ardent-ros-base-xenial
Tagging ros:ardent

$ test/run.sh ros:ardent-ros-base
testing ros:ardent-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:bouncy-ros-core
Building bashbrew/cache:1423560bec5f3a0b8d7bee735417a6c1cd8faa5667ecbb3ca959a131d3eb4dca (ros:bouncy-ros-core)
Tagging ros:bouncy-ros-core
Tagging ros:bouncy-ros-core-bionic

$ test/run.sh ros:bouncy-ros-core
testing ros:bouncy-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:bouncy-ros-base
Building bashbrew/cache:34d503bc4a1c0313987f17898b605823dde03ab45b8f19aef6082218c3685281 (ros:bouncy-ros-base)
Tagging ros:bouncy-ros-base
Tagging ros:bouncy-ros-base-bionic
Tagging ros:bouncy

$ test/run.sh ros:bouncy-ros-base
testing ros:bouncy-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:crystal-ros-core
Building bashbrew/cache:1a7f37247fd6af467b9a11325bc76b634bad64a30130dc3b9bbcf77f45bd6114 (ros:crystal-ros-core)
Tagging ros:crystal-ros-core
Tagging ros:crystal-ros-core-bionic

$ test/run.sh ros:crystal-ros-core
testing ros:crystal-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:crystal-ros-base
Building bashbrew/cache:6b8d4f95c6f403ff96ae331c2c019c872220e1d2b1b51410d6abb67695985ebe (ros:crystal-ros-base)
Tagging ros:crystal-ros-base
Tagging ros:crystal-ros-base-bionic
Tagging ros:crystal

$ test/run.sh ros:crystal-ros-base
testing ros:crystal-ros-base
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit f799a98 into docker-library:master Jan 11, 2019
@ruffsl
Copy link
Contributor Author

ruffsl commented Jan 11, 2019

Thank you, @tianon !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants