From d8f36fc6f05e7d93c91ad81f6c0e710a1f4a8e23 Mon Sep 17 00:00:00 2001
From: mattx <10520670+mattx433@users.noreply.github.com>
Date: Wed, 27 Apr 2022 21:13:23 +0200
Subject: [PATCH] Install Firefox from PPA instead of stub (#47)

---
 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 811529a5..9bb965de 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 b6a14e5a..af163390 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 171946a6..afb4f9cf 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