From 27cc0b68263bbbb10bb58dd814efc0a6b0a01ec7 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Tue, 19 Dec 2023 10:23:55 +0100 Subject: [PATCH] update keyring folder path Signed-off-by: Mikael Arguedas --- gazebo/11/ubuntu/focal/gzserver11/Dockerfile | 2 +- ros/humble/ubuntu/jammy/ros-core/Dockerfile | 2 +- ros/iron/ubuntu/jammy/ros-core/Dockerfile | 2 +- ros/noetic/ubuntu/focal/ros-core/Dockerfile | 2 +- ros/rolling/ubuntu/jammy/ros-core/Dockerfile | 2 +- ros2/nightly/nightly/Dockerfile | 2 +- ros2/source/devel/Dockerfile | 2 +- ros2/testing/testing/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gazebo/11/ubuntu/focal/gzserver11/Dockerfile b/gazebo/11/ubuntu/focal/gzserver11/Dockerfile index f7401e741..73009b91d 100644 --- a/gazebo/11/ubuntu/focal/gzserver11/Dockerfile +++ b/gazebo/11/ubuntu/focal/gzserver11/Dockerfile @@ -21,7 +21,7 @@ RUN set -eux; \ key='D2486D2DD83DB69272AFE98867170598AF249743'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ + mkdir -p /usr/share/keyrings; \ gpg --batch --export "$key" > /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" diff --git a/ros/humble/ubuntu/jammy/ros-core/Dockerfile b/ros/humble/ubuntu/jammy/ros-core/Dockerfile index 68da46eb6..a142dd9d5 100644 --- a/ros/humble/ubuntu/jammy/ros-core/Dockerfile +++ b/ros/humble/ubuntu/jammy/ros-core/Dockerfile @@ -20,7 +20,7 @@ RUN set -eux; \ key='C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ + mkdir -p /usr/share/keyrings; \ gpg --batch --export "$key" > /usr/share/keyrings/ros2-latest-archive-keyring.gpg; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" diff --git a/ros/iron/ubuntu/jammy/ros-core/Dockerfile b/ros/iron/ubuntu/jammy/ros-core/Dockerfile index 9b33fe9b1..a0e9dd333 100644 --- a/ros/iron/ubuntu/jammy/ros-core/Dockerfile +++ b/ros/iron/ubuntu/jammy/ros-core/Dockerfile @@ -20,7 +20,7 @@ RUN set -eux; \ key='C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ + mkdir -p /usr/share/keyrings; \ gpg --batch --export "$key" > /usr/share/keyrings/ros2-latest-archive-keyring.gpg; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" diff --git a/ros/noetic/ubuntu/focal/ros-core/Dockerfile b/ros/noetic/ubuntu/focal/ros-core/Dockerfile index 098fa1dc9..434ca833b 100644 --- a/ros/noetic/ubuntu/focal/ros-core/Dockerfile +++ b/ros/noetic/ubuntu/focal/ros-core/Dockerfile @@ -20,7 +20,7 @@ RUN set -eux; \ key='C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ + mkdir -p /usr/share/keyrings; \ gpg --batch --export "$key" > /usr/share/keyrings/ros1-latest-archive-keyring.gpg; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" diff --git a/ros/rolling/ubuntu/jammy/ros-core/Dockerfile b/ros/rolling/ubuntu/jammy/ros-core/Dockerfile index 29863ef34..f92c9df5b 100644 --- a/ros/rolling/ubuntu/jammy/ros-core/Dockerfile +++ b/ros/rolling/ubuntu/jammy/ros-core/Dockerfile @@ -20,7 +20,7 @@ RUN set -eux; \ key='C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ + mkdir -p /usr/share/keyrings; \ gpg --batch --export "$key" > /usr/share/keyrings/ros2-latest-archive-keyring.gpg; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" diff --git a/ros2/nightly/nightly/Dockerfile b/ros2/nightly/nightly/Dockerfile index 26a0bf107..38d66478b 100644 --- a/ros2/nightly/nightly/Dockerfile +++ b/ros2/nightly/nightly/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux; \ key='C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ + mkdir -p /usr/share/keyrings; \ gpg --batch --export "$key" > /usr/share/keyrings/ros2-testing-archive-keyring.gpg; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" diff --git a/ros2/source/devel/Dockerfile b/ros2/source/devel/Dockerfile index 104c6e1a9..100f0cde7 100644 --- a/ros2/source/devel/Dockerfile +++ b/ros2/source/devel/Dockerfile @@ -31,7 +31,7 @@ RUN set -eux; \ key='C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ + mkdir -p /usr/share/keyrings; \ gpg --batch --export "$key" > /usr/share/keyrings/ros2-latest-archive-keyring.gpg; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" diff --git a/ros2/testing/testing/Dockerfile b/ros2/testing/testing/Dockerfile index eeffc4a29..33b2a6cf6 100644 --- a/ros2/testing/testing/Dockerfile +++ b/ros2/testing/testing/Dockerfile @@ -18,7 +18,7 @@ RUN set -eux; \ key='C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /etc/apt/keyrings; \ + mkdir -p /usr/share/keyrings; \ gpg --batch --export "$key" > /usr/share/keyrings/ros2-testing-archive-keyring.gpg; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"