[ROS] Updating Keyserver URL #3163
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
Diff:diff --git a/ros_indigo-perception/Dockerfile b/ros_indigo-perception/Dockerfile
index 91faa78..f50da10 100644
--- a/ros_indigo-perception/Dockerfile
+++ b/ros_indigo-perception/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:indigo-perception
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-05-23 21:41:45 +0000
FROM ros:indigo-ros-base
# install ros packages
diff --git a/ros_indigo-robot/Dockerfile b/ros_indigo-robot/Dockerfile
index 930fdbb..fa15097 100644
--- a/ros_indigo-robot/Dockerfile
+++ b/ros_indigo-robot/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:indigo-robot
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-05-23 21:41:45 +0000
FROM ros:indigo-ros-base
# install ros packages
diff --git a/ros_indigo-ros-core/Dockerfile b/ros_indigo-ros-core/Dockerfile
index befef40..9ba1503 100644
--- a/ros_indigo-ros-core/Dockerfile
+++ b/ros_indigo-ros-core/Dockerfile
@@ -1,10 +1,9 @@
# This is an auto generated Dockerfile for ros:indigo-ros-core
# generated from templates/docker_images/create_ros_core_image.Dockerfile.em
-# generated on 2017-05-23 21:41:45 +0000
FROM ubuntu:trusty
# setup keys
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
# setup sources.list
RUN echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list
diff --git a/ros_indigo/Dockerfile b/ros_indigo/Dockerfile
index b7416d5..948cf57 100644
--- a/ros_indigo/Dockerfile
+++ b/ros_indigo/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:indigo-ros-base
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-05-23 21:41:45 +0000
FROM ros:indigo-ros-core
# install ros packages
diff --git a/ros_jade-perception/Dockerfile b/ros_jade-perception/Dockerfile
index 04b8aba..60bd7dc 100644
--- a/ros_jade-perception/Dockerfile
+++ b/ros_jade-perception/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:jade-perception
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-05-23 21:41:28 +0000
FROM ros:jade-ros-base
# install ros packages
diff --git a/ros_jade-robot/Dockerfile b/ros_jade-robot/Dockerfile
index 36d4145..a24b74f 100644
--- a/ros_jade-robot/Dockerfile
+++ b/ros_jade-robot/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:jade-robot
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-05-23 21:41:28 +0000
FROM ros:jade-ros-base
# install ros packages
diff --git a/ros_jade-ros-core/Dockerfile b/ros_jade-ros-core/Dockerfile
index f6351d8..364379d 100644
--- a/ros_jade-ros-core/Dockerfile
+++ b/ros_jade-ros-core/Dockerfile
@@ -1,10 +1,9 @@
# This is an auto generated Dockerfile for ros:jade-ros-core
# generated from templates/docker_images/create_ros_core_image.Dockerfile.em
-# generated on 2017-05-23 21:41:28 +0000
FROM ubuntu:trusty
# setup keys
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
# setup sources.list
RUN echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list
diff --git a/ros_jade/Dockerfile b/ros_jade/Dockerfile
index f1c2f7a..331b98c 100644
--- a/ros_jade/Dockerfile
+++ b/ros_jade/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:jade-ros-base
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-05-23 21:41:28 +0000
FROM ros:jade-ros-core
# install ros packages
diff --git a/ros_kinetic-perception/Dockerfile b/ros_kinetic-perception/Dockerfile
index 5523c91..bc128ea 100644
--- a/ros_kinetic-perception/Dockerfile
+++ b/ros_kinetic-perception/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:kinetic-perception
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-06-10 20:30:32 +0000
FROM ros:kinetic-ros-base
# install ros packages
diff --git a/ros_kinetic-robot/Dockerfile b/ros_kinetic-robot/Dockerfile
index 9177032..736f1af 100644
--- a/ros_kinetic-robot/Dockerfile
+++ b/ros_kinetic-robot/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:kinetic-robot
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-06-10 20:30:32 +0000
FROM ros:kinetic-ros-base
# install ros packages
diff --git a/ros_kinetic-ros-core/Dockerfile b/ros_kinetic-ros-core/Dockerfile
index 406fbd5..7d5c9a6 100644
--- a/ros_kinetic-ros-core/Dockerfile
+++ b/ros_kinetic-ros-core/Dockerfile
@@ -1,10 +1,9 @@
# This is an auto generated Dockerfile for ros:kinetic-ros-core
# generated from templates/docker_images/create_ros_core_image.Dockerfile.em
-# generated on 2017-06-10 20:30:32 +0000
FROM ubuntu:xenial
# setup keys
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
# setup sources.list
RUN echo "deb http://packages.ros.org/ros/ubuntu xenial main" > /etc/apt/sources.list.d/ros-latest.list
diff --git a/ros_latest/Dockerfile b/ros_latest/Dockerfile
index 35bc9f0..4ef9efc 100644
--- a/ros_latest/Dockerfile
+++ b/ros_latest/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:kinetic-ros-base
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-06-10 20:30:32 +0000
FROM ros:kinetic-ros-core
# install ros packages
diff --git a/ros_lunar-perception/Dockerfile b/ros_lunar-perception/Dockerfile
index 564b06b..7e44f54 100644
--- a/ros_lunar-perception/Dockerfile
+++ b/ros_lunar-perception/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:lunar-perception
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-05-23 21:41:02 +0000
FROM ros:lunar-ros-base
# install ros packages
diff --git a/ros_lunar-robot/Dockerfile b/ros_lunar-robot/Dockerfile
index b355546..1f1c6e5 100644
--- a/ros_lunar-robot/Dockerfile
+++ b/ros_lunar-robot/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:lunar-robot
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-05-23 21:41:02 +0000
FROM ros:lunar-ros-base
# install ros packages
diff --git a/ros_lunar-ros-core/Dockerfile b/ros_lunar-ros-core/Dockerfile
index 2f1a419..6e3ad24 100644
--- a/ros_lunar-ros-core/Dockerfile
+++ b/ros_lunar-ros-core/Dockerfile
@@ -1,10 +1,9 @@
# This is an auto generated Dockerfile for ros:lunar-ros-core
# generated from templates/docker_images/create_ros_core_image.Dockerfile.em
-# generated on 2017-05-23 21:41:02 +0000
FROM ubuntu:xenial
# setup keys
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
# setup sources.list
RUN echo "deb http://packages.ros.org/ros/ubuntu xenial main" > /etc/apt/sources.list.d/ros-latest.list
diff --git a/ros_lunar/Dockerfile b/ros_lunar/Dockerfile
index d8b432a..42810b7 100644
--- a/ros_lunar/Dockerfile
+++ b/ros_lunar/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for ros:lunar-ros-base
# generated from templates/docker_images/create_ros_image.Dockerfile.em
-# generated on 2017-05-23 21:41:02 +0000
FROM ros:lunar-ros-core
# install ros packages |
|
Build test of #3163; b235516 ( $ bashbrew build ros:indigo-ros-core
Building bashbrew/cache:1d0791042a360b6bea0c319be71e47a3e8fefc2857159da44ba988481dfc8ad3 (ros:indigo-ros-core)
Tagging ros:indigo-ros-core
$ 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
Building bashbrew/cache:a1b7acfc42db8cf30331567840831e36b870937b00ac4eb33b231fa755642113 (ros:indigo-ros-base)
Tagging ros:indigo-ros-base
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
Building bashbrew/cache:6bbe65fd42b72738aa87bb187a406e6b810042f6194741e62a16a2f002f37691 (ros:indigo-robot)
Tagging ros:indigo-robot
$ 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
Building bashbrew/cache:8367d31ffdbd81e5a93896b604e30d53e67d91ead61cbe732860a465a3e371ac (ros:indigo-perception)
Tagging ros:indigo-perception
$ 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:jade-ros-core
Building bashbrew/cache:f256bc4447180a333e43eb3625b080e4532709918cc91c08b9cfffa54cf5b654 (ros:jade-ros-core)
Tagging ros:jade-ros-core
$ test/run.sh ros:jade-ros-core
testing ros:jade-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:jade-ros-base
Building bashbrew/cache:a6b3b0ff46ac41fe00a986132d12f0727aae1a43551380017928148cca9447d6 (ros:jade-ros-base)
Tagging ros:jade-ros-base
Tagging ros:jade
$ test/run.sh ros:jade-ros-base
testing ros:jade-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:jade-robot
Building bashbrew/cache:708c2071edc029ede20aa09341dfd0973908ee97450031b137ba1435dd77b3b0 (ros:jade-robot)
Tagging ros:jade-robot
$ test/run.sh ros:jade-robot
testing ros:jade-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:jade-perception
Building bashbrew/cache:5a938106c4ebe820e85863800884c0c8c1571d691c5de9f78e550f97be298ad0 (ros:jade-perception)
Tagging ros:jade-perception
$ test/run.sh ros:jade-perception
testing ros:jade-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
Building bashbrew/cache:cf89b4436eb052b87c0e3a2c2154af9bb7c7fb9e4099cf0d71f4d2a352663c89 (ros:kinetic-ros-core)
Tagging ros:kinetic-ros-core
$ 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:ffa9d986befe7c2d5f5402f68e4ac199e189848c02d24675ef7ed2614c529f05 (ros:kinetic-ros-base)
Tagging ros:kinetic-ros-base
Tagging ros:kinetic
Tagging ros:latest
$ 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:555c2180e79c3cf7485c0424d13154ffb5717659f2ad669720e753b4db5556ab (ros:kinetic-robot)
Tagging ros:kinetic-robot
$ 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:6d2867728b809d289d24edf4d2df359cf31e7ff31db9bef55d6e24f88bc5909d (ros:kinetic-perception)
Tagging ros:kinetic-perception
$ 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
Building bashbrew/cache:3aed579531018624fdbb75b0de0e88f8fd571a36d4ff259f86e99975c43ac238 (ros:lunar-ros-core)
Tagging ros:lunar-ros-core
$ 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
Building bashbrew/cache:12f1ed501cd0e7bd04b2b69abd826408f5fc18c74d48a095560bb4815f6a9295 (ros:lunar-ros-base)
Tagging ros:lunar-ros-base
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
Building bashbrew/cache:af6bea321272605e31edd6fcaf9eb22b47b56d2120c153238e1584347e5a3313 (ros:lunar-robot)
Tagging ros:lunar-robot
$ 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
Building bashbrew/cache:8ee52d61a1ba3721e6b2a308ae6619244c57fcda70d487920fc58adf7da3094b (ros:lunar-perception)
Tagging ros:lunar-perception
$ 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
|
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.
Updating keyserver URL to p80 pool osrf/docker_templates#19 (comment)