[Gazebo] Updating keyserver URL #3162
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:warning: insecure protocol git:// detected: git://github.com/osrf/docker_images
diff --git a/gazebo_gzserver4/Dockerfile b/gazebo_gzserver4/Dockerfile
index 1799a41..57908d9 100644
--- a/gazebo_gzserver4/Dockerfile
+++ b/gazebo_gzserver4/Dockerfile
@@ -1,13 +1,14 @@
# This is an auto generated Dockerfile for gazebo:gzserver4
# generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2017-05-29 06:20:54 +0000
FROM ubuntu:trusty
# setup keys
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
# setup sources.list
-RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-latest.list
+RUN . /etc/os-release \
+ && . /etc/lsb-release \
+ && echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable $DISTRIB_CODENAME main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
diff --git a/gazebo_gzserver5/Dockerfile b/gazebo_gzserver5/Dockerfile
index 0694e74..1b7f5b9 100644
--- a/gazebo_gzserver5/Dockerfile
+++ b/gazebo_gzserver5/Dockerfile
@@ -1,13 +1,14 @@
# This is an auto generated Dockerfile for gazebo:gzserver5
# generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2017-05-29 06:20:49 +0000
FROM ubuntu:trusty
# setup keys
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
# setup sources.list
-RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-latest.list
+RUN . /etc/os-release \
+ && . /etc/lsb-release \
+ && echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable $DISTRIB_CODENAME main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
diff --git a/gazebo_gzserver6/Dockerfile b/gazebo_gzserver6/Dockerfile
index c0585d9..3919ea7 100644
--- a/gazebo_gzserver6/Dockerfile
+++ b/gazebo_gzserver6/Dockerfile
@@ -1,13 +1,14 @@
# This is an auto generated Dockerfile for gazebo:gzserver6
# generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2017-05-29 06:20:45 +0000
FROM ubuntu:trusty
# setup keys
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
# setup sources.list
-RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-latest.list
+RUN . /etc/os-release \
+ && . /etc/lsb-release \
+ && echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable $DISTRIB_CODENAME main" > /etc/apt/sources.list.d/gazebo-latest.list
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
diff --git a/gazebo_gzserver7/Dockerfile b/gazebo_gzserver7/Dockerfile
index 5c63f94..1c4812a 100644
--- a/gazebo_gzserver7/Dockerfile
+++ b/gazebo_gzserver7/Dockerfile
@@ -1,10 +1,9 @@
# This is an auto generated Dockerfile for gazebo:gzserver7
# generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2017-06-29 22:56:36 +0000
FROM ubuntu:trusty
# setup keys
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
# setup sources.list
RUN . /etc/os-release \
diff --git a/gazebo_gzserver8/Dockerfile b/gazebo_gzserver8/Dockerfile
index 8fcc5c6..274f0ff 100644
--- a/gazebo_gzserver8/Dockerfile
+++ b/gazebo_gzserver8/Dockerfile
@@ -1,10 +1,9 @@
# This is an auto generated Dockerfile for gazebo:gzserver8
# generated from templates/docker_images/create_gzserver_image.Dockerfile.em
-# generated on 2017-06-08 00:05:04 +0000
FROM ubuntu:xenial
# setup keys
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
# setup sources.list
RUN . /etc/os-release \
diff --git a/gazebo_latest/Dockerfile b/gazebo_latest/Dockerfile
index 4b323a3..15f783e 100644
--- a/gazebo_latest/Dockerfile
+++ b/gazebo_latest/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for gazebo:libgazebo8
# generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2017-06-08 00:05:04 +0000
FROM gazebo:gzserver8
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
diff --git a/gazebo_libgazebo4/Dockerfile b/gazebo_libgazebo4/Dockerfile
index c630920..a90f056 100644
--- a/gazebo_libgazebo4/Dockerfile
+++ b/gazebo_libgazebo4/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for gazebo:libgazebo4
# generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2017-05-29 06:20:54 +0000
FROM gazebo:gzserver4
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
diff --git a/gazebo_libgazebo5/Dockerfile b/gazebo_libgazebo5/Dockerfile
index 52c5dd6..4314053 100644
--- a/gazebo_libgazebo5/Dockerfile
+++ b/gazebo_libgazebo5/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for gazebo:libgazebo5
# generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2017-05-29 06:20:49 +0000
FROM gazebo:gzserver5
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
diff --git a/gazebo_libgazebo6/Dockerfile b/gazebo_libgazebo6/Dockerfile
index da67d72..40670cf 100644
--- a/gazebo_libgazebo6/Dockerfile
+++ b/gazebo_libgazebo6/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for gazebo:libgazebo6
# generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2017-05-29 06:20:45 +0000
FROM gazebo:gzserver6
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
diff --git a/gazebo_libgazebo7/Dockerfile b/gazebo_libgazebo7/Dockerfile
index e01e31b..163e3c8 100644
--- a/gazebo_libgazebo7/Dockerfile
+++ b/gazebo_libgazebo7/Dockerfile
@@ -1,6 +1,5 @@
# This is an auto generated Dockerfile for gazebo:libgazebo7
# generated from templates/docker_images/create_gzclient_image.Dockerfile.em
-# generated on 2017-06-29 22:56:36 +0000
FROM gazebo:gzserver7
# install gazebo packages
RUN apt-get update && apt-get install -q -y \ |
|
Build test of #3162; 7386068 ( $ bashbrew build gazebo:gzserver4
Building bashbrew/cache:5a43805882c44ecbc235760acceab180c8026b672d3e812034438ba76ba2e4a1 (gazebo:gzserver4)
Tagging gazebo:gzserver4
$ test/run.sh gazebo:gzserver4
testing gazebo:gzserver4
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build gazebo:libgazebo4
Building bashbrew/cache:2ba9ea702d89f9feccb22c94ce7573e976cb4ac625e6a7abe2fd01cf97d66361 (gazebo:libgazebo4)
Tagging gazebo:libgazebo4
$ test/run.sh gazebo:libgazebo4
testing gazebo:libgazebo4
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build gazebo:gzserver5
Building bashbrew/cache:71abb9f329fb09d822a4b5b5018a230c8bf3a0b5caa49509e3f45963768a1fff (gazebo:gzserver5)
Tagging gazebo:gzserver5
$ test/run.sh gazebo:gzserver5
testing gazebo:gzserver5
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build gazebo:libgazebo5
Building bashbrew/cache:685cfc3f635a75176b0c4beca38a2739eb51792edc396746a54ded5b9ba7fa19 (gazebo:libgazebo5)
Tagging gazebo:libgazebo5
$ test/run.sh gazebo:libgazebo5
testing gazebo:libgazebo5
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build gazebo:gzserver6
Building bashbrew/cache:1e14357098ac0d1eb02f0dd492d22c588a852f8a1eb2bf2e169287043652b15e (gazebo:gzserver6)
Tagging gazebo:gzserver6
$ test/run.sh gazebo:gzserver6
testing gazebo:gzserver6
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build gazebo:libgazebo6
Building bashbrew/cache:001eccfd3234e8f117d9c2ef23a9816d651cd541b172dc3c173d35611d79d765 (gazebo:libgazebo6)
Tagging gazebo:libgazebo6
$ test/run.sh gazebo:libgazebo6
testing gazebo:libgazebo6
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build gazebo:gzserver7
Building bashbrew/cache:3ae135196060fb276ecf8322e8981a0abe861d343e4fbaff9633177aff378f2c (gazebo:gzserver7)
Tagging gazebo:gzserver7
$ test/run.sh gazebo:gzserver7
testing gazebo:gzserver7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build gazebo:libgazebo7
Building bashbrew/cache:4e1203638d27ed02112652cbfbd2d36c9f8f272b5658aa8832a4b3b4bcd84116 (gazebo:libgazebo7)
Tagging gazebo:libgazebo7
$ test/run.sh gazebo:libgazebo7
testing gazebo:libgazebo7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build gazebo:gzserver8
Building bashbrew/cache:5b48822479d4b8989b636a9472dec48f1778da9076fa595bbb1cbc157aeb37b3 (gazebo:gzserver8)
Tagging gazebo:gzserver8
$ test/run.sh gazebo:gzserver8
testing gazebo:gzserver8
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build gazebo:libgazebo8
Building bashbrew/cache:53598a84c8a1c75ee972afd611ebe66da1f45c349a4d1677ccde575809a38fbb (gazebo:libgazebo8)
Tagging gazebo:libgazebo8
Tagging gazebo:latest
$ test/run.sh gazebo:libgazebo8
testing gazebo:libgazebo8
'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)