diff --git a/Dockerfile b/Dockerfile index 0a79220..7d5eb74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,22 +6,23 @@ ENV DEBIAN_FRONTEND noninteractive COPY AptSources /etc/apt/sources.list.d/ -ENV FIREFOXVERSION 46.0+build5-0ubuntu0.14.04.2 - RUN useradd -m firefox; \ echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections; \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886; \ - apt-get update; \ - apt-get install -y --no-install-recommends firefox=$FIREFOXVERSION \ - dbus-x11 \ + apt-get update + +RUN apt-get install -y --no-install-recommends dbus-x11 \ adobe-flashplugin \ libxext-dev \ libxrender-dev \ libxtst-dev \ oracle-java8-installer \ - oracle-java8-set-default; \ + oracle-java8-set-default + +RUN apt-get install -y --no-install-recommends firefox; \ rm -rf /var/lib/apt/lists/* COPY start-firefox.sh /tmp/ +RUN chmod 0755 /tmp/start-firefox.sh ENTRYPOINT ["/tmp/start-firefox.sh"] diff --git a/start-firefox.sh b/start-firefox.sh old mode 100755 new mode 100644 diff --git a/start.sh b/start.sh new file mode 100755 index 0000000..dc5a7a0 --- /dev/null +++ b/start.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +if [ $# -gt 0 ] +then + COMMAND=$1 + if [ "${COMMAND}" != "fresh" ] + then + echo "Invalid command. Usage: start.sh {fresh}" + echo + echo " fresh: Starts a brand new Firefox by deleting the container" + exit 1 + fi + + if [ "${COMMAND}" == "fresh" ] + then + docker rm firefox + fi +fi + +docker run \ + -v /tmp/.X11-unix:/tmp/.X11-unix \ + -v /dev/snd:/dev/snd \ + -e uid=$(id -u) \ + -e gid=$(id -g) \ + -e DISPLAY=unix$DISPLAY \ + --name firefox \ + firefox + +if [ $? -eq 125 ] +then + echo "Container already exists... reattaching..." + echo + docker start firefox + docker attach firefox +fi