Skip to content

Commit 5c44a84

Browse files
committed
misc: stop using apt-key, it's deprecated
Fixes: jitsi#480
1 parent 5f06c3a commit 5c44a84

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

base-java/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ${JITSI_REPO}/base
33

44
RUN \
55
mkdir -p /usr/share/man/man1 && \
6-
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
6+
wget -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public -O /etc/apt/trusted.gpg.d/openjdk.asc && \
77
echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main" > /etc/apt/sources.list.d/openjdk.list && \
88
apt-dpkg-wrap apt-get update && \
99
apt-dpkg-wrap apt-get install -y adoptopenjdk-8-hotspot-jre && \

base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN \
1111
apt-dpkg-wrap apt-get update && \
1212
apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget && \
1313
wget -qO - https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz | tar xfz - -C / && \
14-
wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | apt-key add - && \
14+
wget -qO - https://download.jitsi.org/jitsi-key.gpg.key -O /etc/apt/trusted.gpg.d/jitsi.asc && \
1515
wget -q https://github.com/subchen/frep/releases/download/v$FREP_VERSION/frep-$FREP_VERSION-linux-amd64 -O /usr/bin/frep && \
1616
echo "deb https://download.jitsi.org $JITSI_RELEASE/" > /etc/apt/sources.list.d/jitsi.list && \
1717
echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list && \

jibri/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN \
1515

1616
RUN \
1717
[ "${CHROME_RELEASE}" = "latest" ] \
18-
&& curl -4s https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
18+
&& wget -q https://dl-ssl.google.com/linux/linux_signing_key.pub -O /etc/apt/trusted.gpg.d/google.asc \
1919
&& echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
2020
&& apt-dpkg-wrap apt-get update \
2121
&& apt-dpkg-wrap apt-get install -y google-chrome-stable \

prosody/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN \
1919
FROM ${JITSI_REPO}/base
2020

2121
RUN \
22-
wget -qO - https://prosody.im/files/prosody-debian-packages.key | apt-key add - \
22+
wget -q https://prosody.im/files/prosody-debian-packages.key -O - | gpg --enarmor > /etc/apt/trusted.gpg.d/prosody.asc \
2323
&& echo "deb http://packages.prosody.im/debian buster main" > /etc/apt/sources.list.d/prosody.list \
2424
&& apt-dpkg-wrap apt-get update \
2525
&& apt-dpkg-wrap apt-get install -y \

0 commit comments

Comments
 (0)