a tiny refactoring

This commit is contained in:
Andy 2016-04-30 12:04:39 +02:00
parent 131885b692
commit 4e016b4ad6
Signed by: arno
GPG Key ID: 368DDA2E9A471EAC

View File

@ -14,7 +14,13 @@ RUN apt-get update && \
pulseaudio libgl1-mesa-glx x264 && \ pulseaudio libgl1-mesa-glx x264 && \
rm -rf /var/lib/apt/lists rm -rf /var/lib/apt/lists
# Obtain the Mozilla Firefox # Workaround: pulseaudio client library likes to remove /dev/shm/pulse-shm-*
# files created by the host, causing sound to stop working.
# To fix this, we either want to disable the shm or mount /dev/shm
# in read-only mode when starting the container.
RUN echo "enable-shm = no" >> /etc/pulse/client.conf
# Mozilla Firefox
# Deps: bzip2 libgtk-3-0 libdbus-glib-1-2 libxt6 # Deps: bzip2 libgtk-3-0 libdbus-glib-1-2 libxt6
ENV FIREFOX_VER 46.0 ENV FIREFOX_VER 46.0
ADD https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VER/linux-x86_64/en-US/firefox-$FIREFOX_VER.tar.bz2 /tmp/firefox.tar.bz2 ADD https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VER/linux-x86_64/en-US/firefox-$FIREFOX_VER.tar.bz2 /tmp/firefox.tar.bz2
@ -61,12 +67,6 @@ RUN mkdir -p /opt/java/64 && \
update-alternatives --install "/usr/bin/javaws" "javaws" "/opt/java/64/jre/bin/javaws" 1 && \ update-alternatives --install "/usr/bin/javaws" "javaws" "/opt/java/64/jre/bin/javaws" 1 && \
update-alternatives --set javaws /opt/java/64/jre/bin/javaws update-alternatives --set javaws /opt/java/64/jre/bin/javaws
# Workaround: pulseaudio client library likes to remove /dev/shm/pulse-shm-*
# files created by the host, causing sound to stop working.
# To fix this, we either want to disable the shm or mount /dev/shm
# in read-only mode when starting the container.
RUN echo "enable-shm = no" >> /etc/pulse/client.conf
# Define a user under which the Firefox will be running # Define a user under which the Firefox will be running
ENV USER user ENV USER user
ENV UID 1000 ENV UID 1000