[ros] eloquent and melodic/debian stretch now use snapshots repository#10270
Merged
yosifkit merged 1 commit intodocker-library:masterfrom Jun 2, 2021
Merged
Conversation
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Diff for 38dc08d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index c6de720..1585c1c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,7 +8,7 @@ Directory: ros/dashing/ubuntu/bionic/ros-core
Tags: eloquent-ros-core, eloquent-ros-core-bionic
Architectures: amd64, arm32v7, arm64v8
-GitCommit: b3e79c3aef3687b56b3c1052ae38aa7010234834
+GitCommit: 45dbb7bd0bb08303e50ecde4a60e827f7cec0ab0
Directory: ros/eloquent/ubuntu/bionic/ros-core
Tags: foxy-ros-core, foxy-ros-core-focal
@@ -33,7 +33,7 @@ Directory: ros/melodic/ubuntu/bionic/ros-core
Tags: melodic-ros-core-stretch
Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
+GitCommit: d017429ffef82c2ae91e5f81a4a60640b2ad6c1b
Directory: ros/melodic/debian/stretch/ros-core
Tags: noetic-ros-core, noetic-ros-core-focal
@@ -108,7 +108,7 @@ Directory: ros/dashing/ubuntu/bionic/ros1-bridge
Tags: eloquent-ros1-bridge, eloquent-ros1-bridge-bionic
Architectures: amd64, arm32v7, arm64v8
-GitCommit: b3e79c3aef3687b56b3c1052ae38aa7010234834
+GitCommit: 45dbb7bd0bb08303e50ecde4a60e827f7cec0ab0
Directory: ros/eloquent/ubuntu/bionic/ros1-bridge
Tags: foxy-ros1-bridge, foxy-ros1-bridge-focal
diff --git a/ros_eloquent-ros-core-bionic/Dockerfile b/ros_eloquent-ros-core-bionic/Dockerfile
index 8f7f6d8..97e1085 100644
--- a/ros_eloquent-ros-core-bionic/Dockerfile
+++ b/ros_eloquent-ros-core-bionic/Dockerfile
@@ -15,11 +15,11 @@ 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 bionic main" > /etc/apt/sources.list.d/ros2-latest.list
+RUN echo "deb http://snapshots.ros.org/eloquent/final/ubuntu bionic main" > /etc/apt/sources.list.d/ros2-snapshots.list
+
+# setup keys
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 4B63CF8FDE49746E98FA01DDAD19BAB3CBF125EA
# setup environment
ENV LANG C.UTF-8
diff --git a/ros_eloquent-ros1-bridge-bionic/Dockerfile b/ros_eloquent-ros1-bridge-bionic/Dockerfile
index b75e484..dfd0ee7 100644
--- a/ros_eloquent-ros1-bridge-bionic/Dockerfile
+++ b/ros_eloquent-ros1-bridge-bionic/Dockerfile
@@ -2,18 +2,18 @@
# generated from docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em
FROM ros:eloquent-ros-base-bionic
-# 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 bionic main" > /etc/apt/sources.list.d/ros1-latest.list
+# setup keys
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
+
ENV ROS1_DISTRO melodic
ENV ROS2_DISTRO eloquent
# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-melodic-ros-comm=1.14.10-1* \
+ ros-melodic-ros-comm=1.14.11-1* \
ros-melodic-roscpp-tutorials=0.9.3-1* \
ros-melodic-rospy-tutorials=0.9.3-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_melodic-ros-core-stretch/Dockerfile b/ros_melodic-ros-core-stretch/Dockerfile
index 0133531..dd3f8cf 100644
--- a/ros_melodic-ros-core-stretch/Dockerfile
+++ b/ros_melodic-ros-core-stretch/Dockerfile
@@ -8,11 +8,11 @@ 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 stretch main" > /etc/apt/sources.list.d/ros1-latest.list
+RUN echo "deb http://snapshots.ros.org/melodic/final/debian stretch main" > /etc/apt/sources.list.d/ros1-snapshots.list
+
+# setup keys
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 4B63CF8FDE49746E98FA01DDAD19BAB3CBF125EA
# setup environment
ENV LANG C.UTF-8
|
Contributor
Author
|
The build failure on dashing are expected on this PR and are addressed by #10272 |
Member
|
Thanks for the clarification. There was some overlap between the two PRs and so I wasn't sure if one replaced the other. I think they'll merge without a conflict. Next time I'd suggest just doing one PR and then you wouldn't have build failures. |
Contributor
Author
|
Thanks, as I wasn't sure the approach in the other PR would need iterations, I went with 2 PRs addressing 2 different issues (one for the key change and one for EOLing the old images) |
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.
This is to trigger a final build of ROS eloquent images and ROS melodic on debian strretch before retiring them.
Related to #8405, osrf/docker_images#529 and osrf/docker_images#430