refactored

This commit is contained in:
Andy 2016-04-02 21:47:58 +02:00
parent 60d56f729f
commit ae11397d01
Signed by: arno
GPG Key ID: 368DDA2E9A471EAC
3 changed files with 26 additions and 16 deletions

View File

@ -7,24 +7,17 @@ MAINTAINER Andrey Arapov <andrey.arapov@nixaid.com>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
# -- Install the prerequisites # -- Install the prerequisites
# adwaita-icon-theme is required so that cursor size is not ultra tiny
# gnome-themes-standard and gnome-themes-standard-data are for nice GTK UI
RUN sed -i.bak 's/jessie main/jessie main contrib/g' /etc/apt/sources.list \ RUN sed -i.bak 's/jessie main/jessie main contrib/g' /etc/apt/sources.list \
&& apt-get update \ && apt-get update \
&& apt-get install -yq bzip2 libfreetype6 libfontconfig1 \ && apt-get install -yq bzip2 libfreetype6 libfontconfig1 \
libxrender1 libxext6 libxdamage1 libxcomposite1 libasound2 \ libxrender1 libxext6 libxdamage1 libxcomposite1 libasound2 \
libdbus-glib-1-2 libgtk2.0-0 libxt6 libcanberra-gtk-module \ libdbus-glib-1-2 libgtk2.0-0 libxt6 libcanberra-gtk-module \
libv4l-0 \
pulseaudio \ pulseaudio \
adwaita-icon-theme \
gnome-themes-standard gnome-themes-standard-data \
flashplugin-nonfree \ flashplugin-nonfree \
fonts-droid fonts-freefont-ttf \ fonts-droid fonts-freefont-ttf \
&& rm -rf /var/lib/apt/lists && rm -rf /var/lib/apt/lists
# If you do not want to use pulseaudio
# COPY asoundrc /etc/asound.conf
# RUN chgrp audio /etc/asound.conf && chmod 0640 /etc/asound.conf
# -- Adobe Flash Plugin # -- Adobe Flash Plugin
RUN update-flashplugin-nonfree --install RUN update-flashplugin-nonfree --install

View File

@ -12,7 +12,7 @@ Extensions
I have decided to add here a list of the Firefox's extensions I am using I have decided to add here a list of the Firefox's extensions I am using
``` ```
https://www.eff.org/privacybadger https://www.eff.org/privacybadger
https://adblockplus.org/ https://adblockultimate.net/
``` ```
Extra Extra
@ -29,3 +29,18 @@ Check the codecs
``` ```
https://www.youtube.com/html5 https://www.youtube.com/html5
``` ```
To initialize the new Firefox profile
```
docker-compose run --rm firefox -P
```
Limitations
===========
X11 and PulseAudio
------------------
The user ID must match the ID of a user that runs the container,
otherwise X neither audio will work.

View File

@ -5,22 +5,24 @@ services:
build: ./ build: ./
read_only: true read_only: true
networks: networks:
- net - isolated
- pulseaudio
devices: devices:
- /dev/dri - /dev/dri
volumes: volumes:
- /tmp/.X11-unix:/tmp/.X11-unix - /tmp/.X11-unix:/tmp/.X11-unix
- /tmp/krb5cc_1000:/tmp/krb5cc_1000:ro - /usr/lib/x86_64-linux-gnu/gtk-2.0/2.10.0/engines:/usr/lib/x86_64-linux-gnu/gtk-2.0/2.10.0/engines:ro
- /usr/share/themes:/usr/share/themes:ro
- /usr/share/icons:/usr/share/icons:ro
- /var/run/cups:/var/run/cups:ro - /var/run/cups:/var/run/cups:ro
# - /tmp/krb5cc_1000:/tmp/krb5cc_1000:ro
- /etc/machine-id:/etc/machine-id:ro
- /run/user/1000/pulse:/run/user/1000/pulse
- $HOME/.mozilla:/home/firefox/.mozilla - $HOME/.mozilla:/home/firefox/.mozilla
- $HOME/Downloads:/home/firefox/Downloads - $HOME/Downloads:/home/firefox/Downloads
environment: environment:
DISPLAY: unix$DISPLAY DISPLAY: unix$DISPLAY
PULSE_SERVER: tcp:pulseaudio:4713
networks: networks:
net: {} isolated:
pulseaudio:
external: external:
name: pulseaudio_net name: isolated