update keyring folder path

Signed-off-by: Mikael Arguedas <[email protected]>
osrf · Dec 19, 2023 · 27cc0b6 · 27cc0b6
1 parent c0cf6a0
commit 27cc0b6
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"