diff --git a/Dockerfile b/Dockerfile index 6d4cca7..b256bca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,24 +7,17 @@ MAINTAINER Andrey Arapov ENV DEBIAN_FRONTEND noninteractive # -- 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 \ && apt-get update \ && apt-get install -yq bzip2 libfreetype6 libfontconfig1 \ libxrender1 libxext6 libxdamage1 libxcomposite1 libasound2 \ libdbus-glib-1-2 libgtk2.0-0 libxt6 libcanberra-gtk-module \ + libv4l-0 \ pulseaudio \ - adwaita-icon-theme \ - gnome-themes-standard gnome-themes-standard-data \ flashplugin-nonfree \ fonts-droid fonts-freefont-ttf \ && 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 RUN update-flashplugin-nonfree --install diff --git a/README.md b/README.md index 44c7be7..c620715 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Extensions I have decided to add here a list of the Firefox's extensions I am using ``` https://www.eff.org/privacybadger -https://adblockplus.org/ +https://adblockultimate.net/ ``` Extra @@ -29,3 +29,18 @@ Check the codecs ``` 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. + diff --git a/docker-compose.yml b/docker-compose.yml index 1a5b1f3..fd44d87 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,22 +5,24 @@ services: build: ./ read_only: true networks: - - net - - pulseaudio + - isolated devices: - /dev/dri volumes: - /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 + # - /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/Downloads:/home/firefox/Downloads environment: DISPLAY: unix$DISPLAY - PULSE_SERVER: tcp:pulseaudio:4713 networks: - net: {} - pulseaudio: + isolated: external: - name: pulseaudio_net + name: isolated