diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Dockerfile | 15 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rwxr-xr-x | create.sh | 2 | ||||
-rwxr-xr-x | run.sh | 2 |
6 files changed, 14 insertions, 10 deletions
@@ -1,2 +1,3 @@ +jre-6u45-linux-x64.bin jre-8u221-linux-x64.tar.gz waterfox-*.tar.bz2 @@ -2,7 +2,7 @@ FROM debian:buster -COPY waterfox*.tar.bz2 jre-*.tar.gz /root/ +COPY waterfox*.tar.bz2 jre-*.bin /root/ RUN sed -i '/ buster main/s/ main/ main contrib non-free/' /etc/apt/sources.list @@ -24,18 +24,21 @@ RUN apt-get --yes update && apt-get --yes install --no-install-recommends \ zile RUN set -x; \ + tar -C /usr/local -xf /root/waterfox*.tar.bz2 && \ + rm -f /root/waterfox*.tar.bz2 && \ + ln -s /usr/local/waterfox/waterfox /usr/local/bin + +RUN set -x; \ mkdir -p /usr/local/java && \ - tar -C /usr/local -xf /root/waterfox*.tar.bz2 && \ - rm -f /root/waterfox*.tar.bz2 && \ - tar -C /usr/local/java -xf /root/jre-*.tar.gz && \ - rm -f /root/jre-*.tar.gz && \ + cd /usr/local/java && \ + /root/jre-*.bin && \ echo >>/etc/profile export JRE_HOME=`echo /usr/local/java/jre*` && \ echo >>/etc/profile export 'PATH="$PATH:$JRE_HOME/bin"' && \ update-alternatives --install /usr/bin/java java /usr/local/java/jre*/bin/java 1 && \ update-alternatives --set java /usr/local/java/jre*/bin/java && \ update-alternatives --install /usr/bin/javaws javaws /usr/local/java/jre*/bin/javaws 1 && \ update-alternatives --set javaws /usr/local/java/jre*/bin/javaws && \ - ln -s /usr/local/waterfox/waterfox /usr/local/bin + rm -f /root/jre-*.bin COPY startup.sh handlers.json /root/ COPY icewm.menu /root/.icewm/menu @@ -2,7 +2,7 @@ URL := https://storage-waterfox.netdna-ssl.com/releases/linux64/installer/waterf all: wget -N ${URL} - docker build --tag fireduck . + docker build --tag fireslug . clean: git clean -fx @@ -1,4 +1,4 @@ -Fireduck +Fireslug ======== Waterfox running under Xvnc inside a Docker container, a demented tool @@ -2,4 +2,4 @@ # Sample of how one might start up a container, season to taste. -docker create -it --name fireduck --publish 127.0.0.1:5900:5900 fireduck +docker create -it --name fireslug --publish 127.0.0.1:5900:5900 fireslug @@ -2,4 +2,4 @@ # Another sample of how one might start up a container, season to taste. -docker run -it --rm --publish 127.0.0.1:5900:5900 fireduck +docker run -it --rm --publish 127.0.0.1:5900:5900 fireslug |