osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40036?usp=email )

Change subject: OBS: build_binpkg: use signed-by in sources.list ......................................................................

OBS: build_binpkg: use signed-by in sources.list

Installing repo keys with "apt-key" has been deprecated and fails in debian unstable. Replace it with the new method.

Change-Id: I88164d8d106ff2656efbf78e9d3e4031edd9cf45 --- M scripts/obs/data/build_binpkg.Dockerfile 1 file changed, 3 insertions(+), 7 deletions(-)

Approvals: jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Verified laforge: Looks good to me, approved

diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index 66f1feb..0a96272 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -4,7 +4,7 @@ ARG FEED ARG UID

-COPY Release.key /tmp/Release.key +COPY Release.key /usr/share/keyrings/osmocom.asc

RUN useradd --uid=${UID} -m user

@@ -83,15 +83,11 @@ VERSION="$(echo "$DISTRO" | cut -d : -f 2 | sed 's/./\u&/')"; \ case "$DISTRO" in \ debian:*) \ - apt-key add /tmp/Release.key && \ - rm /tmp/Release.key && \ - echo "deb https://downloads.osmocom.org/packages/osmocom:/$FEED/Debian_$VERSION/ ./" \ + echo "deb [signed-by=/usr/share/keyrings/osmocom.asc] https://downloads.osmocom.org/packages/osmocom:/$FEED/Debian_$VERSION/ ./" \ > /etc/apt/sources.list.d/osmocom-$FEED.list \ ;; \ ubuntu:*) \ - apt-key add /tmp/Release.key && \ - rm /tmp/Release.key && \ - echo "deb https://downloads.osmocom.org/packages/osmocom:/$FEED/xUbuntu_$VERSION/ ./" \ + echo "deb [signed-by=/usr/share/keyrings/osmocom.asc] https://downloads.osmocom.org/packages/osmocom:/$FEED/xUbuntu_$VERSION/ ./" \ > /etc/apt/sources.list.d/osmocom-$FEED.list \ ;; \ almalinux:*|centos:*) \