[ros] update 2 more images for outdated GPG key and retire EOL images#10293
Merged
yosifkit merged 2 commits intodocker-library:masterfrom Jun 3, 2021
Merged
Conversation
Contributor
mikaelarguedas
commented
Jun 2, 2021
- update noetic-ros-core and fox-ros-core to install the new GPG key
- remove EOL images: all ros eloquent images and ros melodic debian stretch images
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Diff for 5ce6096:diff --git a/_bashbrew-cat b/_bashbrew-cat
index f70dcd5..64ab2a5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,14 +6,9 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d
Directory: ros/dashing/ubuntu/bionic/ros-core
-Tags: eloquent-ros-core, eloquent-ros-core-bionic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 45dbb7bd0bb08303e50ecde4a60e827f7cec0ab0
-Directory: ros/eloquent/ubuntu/bionic/ros-core
-
Tags: foxy-ros-core, foxy-ros-core-focal
Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
+GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d
Directory: ros/foxy/ubuntu/focal/ros-core
Tags: galactic-ros-core, galactic-ros-core-focal
@@ -31,14 +26,9 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d
Directory: ros/melodic/ubuntu/bionic/ros-core
-Tags: melodic-ros-core-stretch
-Architectures: amd64, arm64v8
-GitCommit: d017429ffef82c2ae91e5f81a4a60640b2ad6c1b
-Directory: ros/melodic/debian/stretch/ros-core
-
Tags: noetic-ros-core, noetic-ros-core-focal
Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
+GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d
Directory: ros/noetic/ubuntu/focal/ros-core
Tags: noetic-ros-core-buster
@@ -56,11 +46,6 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
Directory: ros/dashing/ubuntu/bionic/ros-base
-Tags: eloquent-ros-base, eloquent-ros-base-bionic, eloquent
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: b3e79c3aef3687b56b3c1052ae38aa7010234834
-Directory: ros/eloquent/ubuntu/bionic/ros-base
-
Tags: foxy-ros-base, foxy-ros-base-focal, foxy, latest
Architectures: amd64, arm64v8
GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
@@ -81,11 +66,6 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
Directory: ros/melodic/ubuntu/bionic/ros-base
-Tags: melodic-ros-base-stretch
-Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/melodic/debian/stretch/ros-base
-
Tags: noetic-ros-base, noetic-ros-base-focal, noetic
Architectures: amd64, arm32v7, arm64v8
GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
@@ -106,11 +86,6 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d
Directory: ros/dashing/ubuntu/bionic/ros1-bridge
-Tags: eloquent-ros1-bridge, eloquent-ros1-bridge-bionic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 45dbb7bd0bb08303e50ecde4a60e827f7cec0ab0
-Directory: ros/eloquent/ubuntu/bionic/ros1-bridge
-
Tags: foxy-ros1-bridge, foxy-ros1-bridge-focal
Architectures: amd64, arm64v8
GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d
@@ -136,21 +111,11 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
Directory: ros/melodic/ubuntu/bionic/perception
-Tags: melodic-perception-stretch
-Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/melodic/debian/stretch/perception
-
Tags: melodic-robot, melodic-robot-bionic
Architectures: amd64, arm32v7, arm64v8
GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
Directory: ros/melodic/ubuntu/bionic/robot
-Tags: melodic-robot-stretch
-Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/melodic/debian/stretch/robot
-
Tags: noetic-perception, noetic-perception-focal
Architectures: amd64, arm32v7, arm64v8
GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
diff --git a/_bashbrew-list b/_bashbrew-list
index e7052fd..b156fa0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,13 +5,6 @@ ros:dashing-ros-base
ros:dashing-ros-base-bionic
ros:dashing-ros-core
ros:dashing-ros-core-bionic
-ros:eloquent
-ros:eloquent-ros1-bridge
-ros:eloquent-ros1-bridge-bionic
-ros:eloquent-ros-base
-ros:eloquent-ros-base-bionic
-ros:eloquent-ros-core
-ros:eloquent-ros-core-bionic
ros:foxy
ros:foxy-ros1-bridge
ros:foxy-ros1-bridge-focal
@@ -39,16 +32,12 @@ ros:latest
ros:melodic
ros:melodic-perception
ros:melodic-perception-bionic
-ros:melodic-perception-stretch
ros:melodic-robot
ros:melodic-robot-bionic
-ros:melodic-robot-stretch
ros:melodic-ros-base
ros:melodic-ros-base-bionic
-ros:melodic-ros-base-stretch
ros:melodic-ros-core
ros:melodic-ros-core-bionic
-ros:melodic-ros-core-stretch
ros:noetic
ros:noetic-perception
ros:noetic-perception-buster
diff --git a/ros_eloquent-ros-core-bionic/Dockerfile b/ros_eloquent-ros-core-bionic/Dockerfile
deleted file mode 100644
index 97e1085..0000000
diff --git a/ros_eloquent-ros-core-bionic/ros_entrypoint.sh b/ros_eloquent-ros-core-bionic/ros_entrypoint.sh
deleted file mode 100755
index 80f3ce3..0000000
diff --git a/ros_eloquent-ros1-bridge-bionic/Dockerfile b/ros_eloquent-ros1-bridge-bionic/Dockerfile
deleted file mode 100644
index dfd0ee7..0000000
diff --git a/ros_eloquent-ros1-bridge-bionic/ros_entrypoint.sh b/ros_eloquent-ros1-bridge-bionic/ros_entrypoint.sh
deleted file mode 100755
index 662a9e7..0000000
diff --git a/ros_eloquent/Dockerfile b/ros_eloquent/Dockerfile
deleted file mode 100644
index 6b4958b..0000000
diff --git a/ros_foxy-ros-core-focal/Dockerfile b/ros_foxy-ros-core-focal/Dockerfile
index fc6c1fc..8b6bbfb 100644
--- a/ros_foxy-ros-core-focal/Dockerfile
+++ b/ros_foxy-ros-core-focal/Dockerfile
@@ -15,12 +15,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \
gnupg2 \
&& rm -rf /var/lib/apt/lists/*
-# setup keys
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
-
# setup sources.list
RUN echo "deb http://packages.ros.org/ros2/ubuntu focal main" > /etc/apt/sources.list.d/ros2-latest.list
+# setup keys
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
+
# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
diff --git a/ros_melodic-perception-stretch/Dockerfile b/ros_melodic-perception-stretch/Dockerfile
deleted file mode 100644
index 8e495d0..0000000
diff --git a/ros_melodic-robot-stretch/Dockerfile b/ros_melodic-robot-stretch/Dockerfile
deleted file mode 100644
index 417ced8..0000000
diff --git a/ros_melodic-ros-base-stretch/Dockerfile b/ros_melodic-ros-base-stretch/Dockerfile
deleted file mode 100644
index dfb4bc9..0000000
diff --git a/ros_melodic-ros-core-stretch/Dockerfile b/ros_melodic-ros-core-stretch/Dockerfile
deleted file mode 100644
index dd3f8cf..0000000
diff --git a/ros_melodic-ros-core-stretch/ros_entrypoint.sh b/ros_melodic-ros-core-stretch/ros_entrypoint.sh
deleted file mode 100755
index f481977..0000000
diff --git a/ros_noetic-ros-core-focal/Dockerfile b/ros_noetic-ros-core-focal/Dockerfile
index d526d14..cb598df 100644
--- a/ros_noetic-ros-core-focal/Dockerfile
+++ b/ros_noetic-ros-core-focal/Dockerfile
@@ -15,12 +15,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \
gnupg2 \
&& rm -rf /var/lib/apt/lists/*
-# setup keys
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
-
# setup sources.list
RUN echo "deb http://packages.ros.org/ros/ubuntu focal main" > /etc/apt/sources.list.d/ros1-latest.list
+# setup keys
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
+
# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.