From a8fb76441f47985cfde61498509afd0fe97407a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Wed, 24 Jan 2024 20:41:20 +0100 Subject: [PATCH] Install Firefox from the official repository --- Dockerfile.m4 | 6 +++--- config/apt/preferences.d/firefox.pref | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.m4 b/Dockerfile.m4 index 33e16d0..c16de9d 100644 --- a/Dockerfile.m4 +++ b/Dockerfile.m4 @@ -307,9 +307,9 @@ m4_ifelse(ENABLE_NVIDIA_SUPPORT, 1, [[m4_dnl ]])m4_dnl && rm -rf /var/lib/apt/lists/* -# Add Mozilla Team repository -RUN curl --proto '=https' --tlsv1.3 -sSf 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0AB215679C571D1C8325275B9BDB3D89CE49EC21' | gpg --dearmor -o /etc/apt/trusted.gpg.d/mozillateam.gpg \ - && printf '%s\n' "deb [signed-by=/etc/apt/trusted.gpg.d/mozillateam.gpg] https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/mozillateam.list +# Add Mozilla repository +RUN curl --proto '=https' --tlsv1.3 -sSf 'https://packages.mozilla.org/apt/repo-signing-key.gpg' | gpg --dearmor -o /etc/apt/trusted.gpg.d/mozilla.gpg \ + && printf '%s\n' 'deb [signed-by=/etc/apt/trusted.gpg.d/mozilla.gpg] https://packages.mozilla.org/apt mozilla main' > /etc/apt/sources.list.d/mozilla.list # Install extra packages RUN export DEBIAN_FRONTEND=noninteractive \ diff --git a/config/apt/preferences.d/firefox.pref b/config/apt/preferences.d/firefox.pref index 8b24915..37559b5 100644 --- a/config/apt/preferences.d/firefox.pref +++ b/config/apt/preferences.d/firefox.pref @@ -1,3 +1,3 @@ Package: firefox -Pin: release o=LP-PPA-mozillateam +Pin: release n=mozilla Pin-Priority: 900