update firefox

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
Jess Frazelle 2018-10-04 19:22:29 -04:00
parent 3ef9d78fe9
commit 963d37174d
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
2 changed files with 7 additions and 6 deletions

View File

@ -8,14 +8,14 @@ RUN apt-get update && apt-get install -y \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0AB215679C571D1C8325275B9BDB3D89CE49EC21 \ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0AB215679C571D1C8325275B9BDB3D89CE49EC21 \
&& echo "deb http://ppa.launchpad.net/mozillateam/firefox-next/ubuntu xenial main" >> /etc/apt/sources.list.d/firefox.list \ && echo "deb http://ppa.launchpad.net/mozillateam/firefox-next/ubuntu xenial main" >> /etc/apt/sources.list.d/firefox.list \
&& apt-get update && apt-get install -y \ && apt-get update && apt-get install -y \
apulse \ apulse \
ca-certificates \ ca-certificates \
firefox \ firefox \
hicolor-icon-theme \ hicolor-icon-theme \
libasound2 \ libasound2 \
libgl1-mesa-dri \ libgl1-mesa-dri \
libgl1-mesa-glx \ libgl1-mesa-glx \
libpulse0 \ libpulse0 \
--no-install-recommends \ --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
@ -25,8 +25,6 @@ COPY local.conf /etc/fonts/local.conf
RUN echo 'pref("browser.tabs.remote.autostart", false);' >> /etc/firefox/syspref.js RUN echo 'pref("browser.tabs.remote.autostart", false);' >> /etc/firefox/syspref.js
RUN echo "#! /bin/bash \n\ COPY entrypoint.sh /usr/bin/startfirefox
[ -e /dev/snd ] && exec apulse firefox || exec firefox \n\
" >/usr/local/bin/startfirefox && chmod +x /usr/local/bin/startfirefox
ENTRYPOINT [ "/usr/local/bin/startfirefox" ] ENTRYPOINT [ "startfirefox" ]

3
firefox/entrypoint.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
[ -e /dev/snd ] && exec apulse firefox || exec firefox