From 64a024e68d2e08a1b8278da8d671f2fbc077d76b Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 18 Jul 2022 18:43:40 +0200 Subject: [PATCH] fix ubuntu-kde for jammy add mozilla ppa for firefox --- Dockerfile | 4 ++++ Dockerfile.aarch64 | 4 ++++ Dockerfile.armhf | 4 ++++ root/etc/apt/preferences.d/firefox-no-snap | 3 +++ 4 files changed, 15 insertions(+) create mode 100644 root/etc/apt/preferences.d/firefox-no-snap diff --git a/Dockerfile b/Dockerfile index 65cec885..bb1a016c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,12 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" +# prevent Ubuntu's firefox stub from being installed +COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap + RUN \ echo "**** install packages ****" && \ + add-apt-repository -y ppa:mozillateam/ppa && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 148a6c97..f3fc66df 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -6,8 +6,12 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" +# prevent Ubuntu's firefox stub from being installed +COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap + RUN \ echo "**** install packages ****" && \ + add-apt-repository -y ppa:mozillateam/ppa && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6e33276a..3c7fda67 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -6,8 +6,12 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" +# prevent Ubuntu's firefox stub from being installed +COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap + RUN \ echo "**** install packages ****" && \ + add-apt-repository -y ppa:mozillateam/ppa && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ diff --git a/root/etc/apt/preferences.d/firefox-no-snap b/root/etc/apt/preferences.d/firefox-no-snap new file mode 100644 index 00000000..9406bcc0 --- /dev/null +++ b/root/etc/apt/preferences.d/firefox-no-snap @@ -0,0 +1,3 @@ +Package: firefox* +Pin: release o=Ubuntu* +Pin-Priority: -1