From d41580050e8d4d3b2974a9e7ae4edff955ce0e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Sun, 4 Jul 2021 20:15:56 +0200
Subject: [PATCH] switch to latest firefox version.

---
 .m1k1o/firefox/Dockerfile       | 24 +++++++++++++++---------
 .m1k1o/firefox/Dockerfile.arm   |  1 +
 .m1k1o/firefox/neko.js          |  2 ++
 .m1k1o/firefox/policies.json    |  2 +-
 .m1k1o/firefox/supervisord.conf |  6 +++---
 README.md                       |  1 +
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.m1k1o/firefox/Dockerfile b/.m1k1o/firefox/Dockerfile
index 0f4d7b01..6421de92 100644
--- a/.m1k1o/firefox/Dockerfile
+++ b/.m1k1o/firefox/Dockerfile
@@ -1,24 +1,30 @@
 ARG BASE_IMAGE=m1k1o/neko:base
 FROM $BASE_IMAGE
 
+ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"
+
 #
-# install firefox-esr
+# install firefox
 RUN set -eux; apt-get update; \
-    apt-get install -y --no-install-recommends openbox firefox-esr; \
+    apt-get install -y --no-install-recommends openbox \
+    xz-utils bzip2 libgtk-3-0 libdbus-glib-1-2; \
     #
-    # install extensions
-    mkdir -p /usr/lib/firefox-esr/distribution/extensions; \
-    wget -O '/usr/lib/firefox-esr/distribution/extensions/uBlock0@raymondhill.net.xpi' https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi; \
-    wget -O /usr/lib/firefox-esr/distribution/extensions/nordvpnproxy@nordvpn.com.xpi https://addons.mozilla.org/firefox/downloads/latest/nordvpn-proxy-extension/latest.xpi; \
+    # fetch latest release
+    wget -O /tmp/firefox-setup.tar.bz2 "${SRC_URL}"; \
+    mkdir /usr/lib/firefox; \
+    tar -xjf /tmp/firefox-setup.tar.bz2 -C /usr/lib; \
+    rm -f /tmp/firefox-setup.tar.bz2; \
+    ln -s /usr/lib/firefox/firefox /usr/bin/firefox; \
     #
     # clean up
+    apt-get --purge autoremove -y xz-utils bzip2; \
     apt-get clean -y; \
     rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #
 # copy configuation files
 COPY supervisord.conf /etc/neko/supervisord/firefox.conf
-COPY neko.js /usr/lib/firefox-esr/mozilla.cfg
-COPY autoconfig.js /usr/lib/firefox-esr/defaults/pref/autoconfig.js
-COPY policies.json /usr/lib/firefox-esr/distribution/policies.json
+COPY neko.js /usr/lib/firefox/mozilla.cfg
+COPY autoconfig.js /usr/lib/firefox/defaults/pref/autoconfig.js
+COPY policies.json /usr/lib/firefox/distribution/policies.json
 COPY openbox.xml /etc/neko/openbox.xml
diff --git a/.m1k1o/firefox/Dockerfile.arm b/.m1k1o/firefox/Dockerfile.arm
index a307aedc..3c4d6827 100644
--- a/.m1k1o/firefox/Dockerfile.arm
+++ b/.m1k1o/firefox/Dockerfile.arm
@@ -5,6 +5,7 @@ FROM $BASE_IMAGE
 # install firefox-esr
 RUN set -eux; apt-get update; \
     apt-get install -y --no-install-recommends openbox firefox-esr libwidevinecdm0; \
+    ln -s /usr/lib/firefox-esr/firefox-esr /usr/bin/firefox; \
     #
     # install extensions
     mkdir -p /usr/lib/firefox-esr/distribution/extensions; \
diff --git a/.m1k1o/firefox/neko.js b/.m1k1o/firefox/neko.js
index 891d521d..a55e1e51 100644
--- a/.m1k1o/firefox/neko.js
+++ b/.m1k1o/firefox/neko.js
@@ -32,4 +32,6 @@ lockPref("devtools.theme", "dark");
 lockPref("ui.systemUsesDarkTheme", 1);
 lockPref("lightweightThemes.usedThemes","[]");
 lockPref("lightweightThemes.selectedThemeID", "firefox-compact-dark@mozilla.org");
+lockPref("extensions.activeThemeID", "firefox-compact-dark@mozilla.org");
+lockPref("browser.theme.toolbar-theme", 0);
 lockPref("browser.in-content.dark-mode", true);
diff --git a/.m1k1o/firefox/policies.json b/.m1k1o/firefox/policies.json
index 8bbb3a1a..ff162df3 100644
--- a/.m1k1o/firefox/policies.json
+++ b/.m1k1o/firefox/policies.json
@@ -77,7 +77,7 @@
     "HardwareAcceleration": false,
     "Homepage": {
       "Additional": [],
-      "StartPage": "none"
+      "StartPage": "home"
     },
     "NewTabPage": true,
     "NoDefaultBookmarks": true,
diff --git a/.m1k1o/firefox/supervisord.conf b/.m1k1o/firefox/supervisord.conf
index d703a8d2..3a0ac2c0 100644
--- a/.m1k1o/firefox/supervisord.conf
+++ b/.m1k1o/firefox/supervisord.conf
@@ -1,10 +1,10 @@
-[program:firefox-esr]
+[program:firefox]
 environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/lib/firefox-esr/firefox-esr --display=%(ENV_DISPLAY)s -setDefaultBrowser -width 1280 -height 720
+command=/usr/bin/firefox --display=%(ENV_DISPLAY)s -setDefaultBrowser -width 1280 -height 720
 autorestart=true
 priority=800
 user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/firefox-esr.log
+stdout_logfile=/var/log/neko/firefox.log
 stdout_logfile_maxbytes=100MB
 stdout_logfile_backups=10
 redirect_stderr=true
diff --git a/README.md b/README.md
index bab653d9..9b350439 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,7 @@ For n.eko room management software visit https://github.com/m1k1o/neko-rooms.
 - Chat messages are dense, when repeated, they are joined together.
 - While IP address fetching is now proxy ignored.
 - Start unmuted on reconnects.
+- Switched to latest firefox version instead of esr.
 
 ### Roadmap & TODOs
 - Catch errors from gst pipeline, tell user if broadcast failed.