Archived
2
0

switch to latest firefox version.

This commit is contained in:
Miroslav Šedivý 2021-07-04 20:15:56 +02:00
parent 02a38d8805
commit d41580050e
6 changed files with 23 additions and 13 deletions

View File

@ -1,24 +1,30 @@
ARG BASE_IMAGE=m1k1o/neko:base ARG BASE_IMAGE=m1k1o/neko:base
FROM $BASE_IMAGE 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; \ 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 # fetch latest release
mkdir -p /usr/lib/firefox-esr/distribution/extensions; \ wget -O /tmp/firefox-setup.tar.bz2 "${SRC_URL}"; \
wget -O '/usr/lib/firefox-esr/distribution/extensions/uBlock0@raymondhill.net.xpi' https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi; \ mkdir /usr/lib/firefox; \
wget -O /usr/lib/firefox-esr/distribution/extensions/nordvpnproxy@nordvpn.com.xpi https://addons.mozilla.org/firefox/downloads/latest/nordvpn-proxy-extension/latest.xpi; \ 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 # clean up
apt-get --purge autoremove -y xz-utils bzip2; \
apt-get clean -y; \ apt-get clean -y; \
rm -rf /var/lib/apt/lists/* /var/cache/apt/* rm -rf /var/lib/apt/lists/* /var/cache/apt/*
# #
# copy configuation files # copy configuation files
COPY supervisord.conf /etc/neko/supervisord/firefox.conf COPY supervisord.conf /etc/neko/supervisord/firefox.conf
COPY neko.js /usr/lib/firefox-esr/mozilla.cfg COPY neko.js /usr/lib/firefox/mozilla.cfg
COPY autoconfig.js /usr/lib/firefox-esr/defaults/pref/autoconfig.js COPY autoconfig.js /usr/lib/firefox/defaults/pref/autoconfig.js
COPY policies.json /usr/lib/firefox-esr/distribution/policies.json COPY policies.json /usr/lib/firefox/distribution/policies.json
COPY openbox.xml /etc/neko/openbox.xml COPY openbox.xml /etc/neko/openbox.xml

View File

@ -5,6 +5,7 @@ FROM $BASE_IMAGE
# install firefox-esr # install firefox-esr
RUN set -eux; apt-get update; \ RUN set -eux; apt-get update; \
apt-get install -y --no-install-recommends openbox firefox-esr libwidevinecdm0; \ apt-get install -y --no-install-recommends openbox firefox-esr libwidevinecdm0; \
ln -s /usr/lib/firefox-esr/firefox-esr /usr/bin/firefox; \
# #
# install extensions # install extensions
mkdir -p /usr/lib/firefox-esr/distribution/extensions; \ mkdir -p /usr/lib/firefox-esr/distribution/extensions; \

View File

@ -32,4 +32,6 @@ lockPref("devtools.theme", "dark");
lockPref("ui.systemUsesDarkTheme", 1); lockPref("ui.systemUsesDarkTheme", 1);
lockPref("lightweightThemes.usedThemes","[]"); lockPref("lightweightThemes.usedThemes","[]");
lockPref("lightweightThemes.selectedThemeID", "firefox-compact-dark@mozilla.org"); 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); lockPref("browser.in-content.dark-mode", true);

View File

@ -77,7 +77,7 @@
"HardwareAcceleration": false, "HardwareAcceleration": false,
"Homepage": { "Homepage": {
"Additional": [], "Additional": [],
"StartPage": "none" "StartPage": "home"
}, },
"NewTabPage": true, "NewTabPage": true,
"NoDefaultBookmarks": true, "NoDefaultBookmarks": true,

View File

@ -1,10 +1,10 @@
[program:firefox-esr] [program:firefox]
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" 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 autorestart=true
priority=800 priority=800
user=%(ENV_USER)s 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_maxbytes=100MB
stdout_logfile_backups=10 stdout_logfile_backups=10
redirect_stderr=true redirect_stderr=true

View File

@ -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. - Chat messages are dense, when repeated, they are joined together.
- While IP address fetching is now proxy ignored. - While IP address fetching is now proxy ignored.
- Start unmuted on reconnects. - Start unmuted on reconnects.
- Switched to latest firefox version instead of esr.
### Roadmap & TODOs ### Roadmap & TODOs
- Catch errors from gst pipeline, tell user if broadcast failed. - Catch errors from gst pipeline, tell user if broadcast failed.