From 1403342af01f51c074d2dcc7fe37be3b21611fe5 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 13 Sep 2019 22:17:40 +0000 Subject: Try waterfox --- .gitignore | 1 + Dockerfile | 13 +++++++++++-- Makefile | 7 +++++-- README.md | 4 ++-- create.sh | 2 +- menu | 2 ++ run.sh | 2 +- 7 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 .gitignore create mode 100644 menu diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..51d4dee --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +waterfox-*.tar.bz2 diff --git a/Dockerfile b/Dockerfile index 57b0ed4..bc881b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,16 +3,25 @@ FROM debian:stretch RUN apt-get --yes update && apt-get --yes install --no-install-recommends \ - firefox-esr \ + bzip2 \ fonts-droid-fallback \ fonts-noto \ icewm \ + libdbus-glib-1-2 \ + libgtk-3-0 \ tightvncserver \ xfonts-base \ x11-xserver-utils \ xterm -COPY startup.sh / +COPY startup.sh waterfox*.tar.bz2 / + +RUN set -x; \ + tar -C /usr/local -xf /waterfox*.tar.bz2 && \ + rm -f /waterfox*.tar.bz2 && \ + ln -s /usr/local/waterfox/waterfox /usr/local/bin + +COPY menu /root/.icewm/ CMD ["/startup.sh"] diff --git a/Makefile b/Makefile index 2a3e1c7..3a5617a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ +URL := https://storage-waterfox.netdna-ssl.com/releases/linux64/installer/waterfox-56.2.14.en-US.linux-x86_64.tar.bz2 + all: - docker build --tag firedock . + wget -N ${URL} + docker build --tag waterbox . clean: - @true + git clean -fx .PHONY: all clean diff --git a/README.md b/README.md index 6ad71d7..f9e9dbd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -FireDock +Waterbox ======== -Firefox running under Xvnc inside a Docker container, a demented tool +Waterfox running under Xvnc inside a Docker container, a demented tool to solve a demented problem. Occasionally one needs to run dangerous code in a web brower, eg, some diff --git a/create.sh b/create.sh index f42f259..f6e50b6 100755 --- a/create.sh +++ b/create.sh @@ -2,4 +2,4 @@ # Sample of how one might start up a container, season to taste. -docker create -it --name firedock --publish 127.0.0.1:5900:5900 firedock +docker create -it --name waterbox --publish 127.0.0.1:5900:5900 waterbox diff --git a/menu b/menu new file mode 100644 index 0000000..590709d --- /dev/null +++ b/menu @@ -0,0 +1,2 @@ +prog Terminal xterm x-terminal-emulator -ls +prog Waterfox firefox /usr/local/waterfox/waterfox diff --git a/run.sh b/run.sh index decc6e2..d0c442e 100755 --- a/run.sh +++ b/run.sh @@ -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 firedock +docker run -it --rm --publish 127.0.0.1:5900:5900 waterbox -- cgit v1.2.3