Rob Austein 5 anni fa
parent
commit
1403342af0
7 ha cambiato i file con 23 aggiunte e 8 eliminazioni
  1. 1 0
      .gitignore
  2. 11 2
      Dockerfile
  3. 5 2
      Makefile
  4. 2 2
      README.md
  5. 1 1
      create.sh
  6. 2 0
      menu
  7. 1 1
      run.sh

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+waterfox-*.tar.bz2

+ 11 - 2
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"]
 

+ 5 - 2
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

+ 2 - 2
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

+ 1 - 1
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

+ 2 - 0
menu

@@ -0,0 +1,2 @@
+prog Terminal xterm x-terminal-emulator -ls
+prog Waterfox firefox /usr/local/waterfox/waterfox

+ 1 - 1
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