Skip to content

Commit 255fc3a

Browse files
committed
tier2: remove apt-key usage
1 parent 71ed4dd commit 255fc3a

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

tier2/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ RUN apt-get update && \
3535
rm -rf rust && \
3636
if [ "$(arch)" = x86_64 ]; then curl -fsS https://dlang.org/install.sh | bash -s dmd --path /opt/dlang \
3737
&& mv /opt/dlang/dmd-*/* /opt/dlang && rmdir /opt/dlang/dmd-*; fi && \
38-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
39-
echo "deb https://download.mono-project.com/repo/debian stable-buster main" > \
38+
gpg --homedir /tmp --no-default-keyring --keyring /usr/share/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
39+
echo "deb [signed-by=/usr/share/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/debian stable-buster main" > \
4040
/etc/apt/sources.list.d/mono-official-stable.list && \
41-
curl https://dmoj.ca/dmoj-apt.key | apt-key add - && \
42-
echo 'deb https://apt.dmoj.ca/ bullseye main' > /etc/apt/sources.list.d/dmoj.list && \
41+
curl -L -O https://dmoj.ca/dmoj-apt.key && \
42+
gpg --homedir /tmp --no-default-keyring --keyring temp-keyring.gpg --import dmoj-apt.key && rm dmoj-apt.key && \
43+
gpg --homedir /tmp --no-default-keyring --keyring temp-keyring.gpg --export --output /usr/share/keyrings/dmoj-keyring.gpg && \
44+
echo 'deb [signed-by=/usr/share/keyrings/dmoj-keyring.gpg] https://apt.dmoj.ca/ bullseye main' > /etc/apt/sources.list.d/dmoj.list && \
4345
(echo 'Package: *'; echo 'Pin: origin download.mono-project.com'; echo 'Pin-Priority: 990') > /etc/apt/preferences.d/mono && \
4446
apt-get update && \
4547
dpkg-divert --package mono-roslyn --divert /usr/bin/chicken-csc --rename /usr/bin/csc && \

0 commit comments

Comments
 (0)