From 08a9636e95cac4380d59e18cdfa06c7166bca6d0 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Mon, 27 Jun 2016 00:11:37 -0500 Subject: [PATCH] remove crufty docker and no-docker scripts --- docker/Dockerfile | 26 -------------------------- docker/vnc-websock.sh | 2 -- docker/vncserver.sh | 12 ------------ no-docker/README.rst | 7 ------- no-docker/vnc-websock.sh | 3 --- no-docker/vncserver.sh | 4 ---- 6 files changed, 54 deletions(-) delete mode 100644 docker/Dockerfile delete mode 100755 docker/vnc-websock.sh delete mode 100755 docker/vncserver.sh delete mode 100644 no-docker/README.rst delete mode 100755 no-docker/vnc-websock.sh delete mode 100755 no-docker/vncserver.sh diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index a8ab831..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM phusion/baseimage -MAINTAINER Noah Levitt - -ENV LANG=C.UTF-8 - -RUN apt-get update && apt-get --auto-remove -y dist-upgrade -RUN apt-get -y install vnc4server -RUN apt-get -y install chromium-browser -RUN apt-get -y install xfonts-base fonts-arphic-bkai00mp fonts-arphic-bsmi00lp fonts-arphic-gbsn00lp fonts-arphic-gkai00mp fonts-arphic-ukai fonts-farsiweb fonts-nafees fonts-sil-abyssinica fonts-sil-ezra fonts-sil-padauk fonts-unfonts-extra fonts-unfonts-core ttf-indic-fonts fonts-thai-tlwg fonts-lklug-sinhala -RUN apt-get -y install python3-pip git vlc -RUN apt-get -y install libjpeg-turbo8-dev zlib1g-dev -RUN pip3 install websockify - -RUN adduser --disabled-password --gecos="Charlie Brozzler" brozzler - -RUN mkdir -vp /etc/service/vncserver -ADD vncserver.sh /etc/service/vncserver/run - -RUN mkdir -vp /etc/service/vnc-websock -ADD vnc-websock.sh /etc/service/vnc-websock/run - -EXPOSE 5901 8901 -EXPOSE 8080 - -# RUN pip3 install -i http://crawl342.us.archive.org:9000/nlevitt/dev/+simple/ git+https://github.com/nlevitt/brozzler.git - diff --git a/docker/vnc-websock.sh b/docker/vnc-websock.sh deleted file mode 100755 index 4fae773..0000000 --- a/docker/vnc-websock.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec setuser brozzler websockify 0.0.0.0:8901 localhost:5901 diff --git a/docker/vncserver.sh b/docker/vncserver.sh deleted file mode 100755 index b980f6e..0000000 --- a/docker/vncserver.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# https://github.com/phusion/baseimage-docker#adding-additional-daemons -# /usr/bin/vncserver backgrounds the Xvnc4 process, so we run Xvnc4 directly - -# password_file=/tmp/vnc-passwd -# /bin/echo -ne '\x95\x3f\x23\x7a\x76\x2a\x05\x89' > $password_file -# exec setuser brozzler Xvnc4 :1 -desktop brozzler@`hostname`:1 -auth /tmp/Xauthority.brozzler -geometry 1600x1000 -depth 24 -rfbwait 0 -nolisten tcp -rfbport 5901 -rfbauth $password_file -pn -fp /usr/share/fonts/X11/misc/ -co /etc/X11/rgb >> /tmp/`hostname`:1.log 2>&1 - -# exec setuser brozzler Xvnc4 :1 -desktop brozzler@`hostname`:1 -auth /tmp/Xauthority.brozzler -geometry 1600x1000 -depth 24 -rfbwait 0 -nolisten tcp -rfbport 5901 -SecurityTypes None -pn -fp /usr/share/fonts/X11/misc/ -co /etc/X11/rgb AcceptCutText=0 AcceptPointerEvents=0 AcceptKeyEvents=0 >> /tmp/`hostname`:1.log 2>&1 -exec setuser brozzler Xvnc4 :1 -desktop brozzler@`hostname`:1 -auth /tmp/Xauthority.brozzler -geometry 1600x1000 -depth 24 -rfbwait 0 -nolisten tcp -rfbport 5901 -SecurityTypes None -pn -fp /usr/share/fonts/X11/misc/ -co /etc/X11/rgb >> /tmp/`hostname`:1.log 2>&1 - diff --git a/no-docker/README.rst b/no-docker/README.rst deleted file mode 100644 index b863649..0000000 --- a/no-docker/README.rst +++ /dev/null @@ -1,7 +0,0 @@ -Chromium seemed to be dying more often when running in a docker container. - -To start the services brozzler-worker depends on: -/home/nlevitt/workspace/brozzler/no-docker/vncserver.sh & /home/nlevitt/workspace/brozzler/no-docker/vnc-websock.sh & - -Prerequisites: -apt-get -y install vnc4server chromium-browser xfonts-base fonts-arphic-bkai00mp fonts-arphic-bsmi00lp fonts-arphic-gbsn00lp fonts-arphic-gkai00mp fonts-arphic-ukai fonts-farsiweb fonts-nafees fonts-sil-abyssinica fonts-sil-ezra fonts-sil-padauk fonts-unfonts-extra fonts-unfonts-core ttf-indic-fonts fonts-thai-tlwg fonts-lklug-sinhala python3-pip git libjpeg-turbo8-dev zlib1g-dev diff --git a/no-docker/vnc-websock.sh b/no-docker/vnc-websock.sh deleted file mode 100755 index 903068d..0000000 --- a/no-docker/vnc-websock.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -PYTHONPATH=/home/nlevitt/workspace/websockify/websockify-ve34/lib/python3.4/site-packages:/home/nlevitt/workspace/websockify exec /home/nlevitt/workspace/websockify/websockify-ve34/bin/websockify 0.0.0.0:8901 localhost:5901 >> /home/nlevitt/workspace/brozzler/no-docker/websockify-`hostname -s`.out 2>&1 diff --git a/no-docker/vncserver.sh b/no-docker/vncserver.sh deleted file mode 100755 index ae31e98..0000000 --- a/no-docker/vncserver.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -exec Xvnc4 :1 -auth /tmp/Xauthority.$USER -geometry 1600x1000 -depth 24 -rfbwait 0 -nolisten tcp -rfbport 5901 -SecurityTypes None -pn -fp /usr/share/fonts/X11/misc/ -co /etc/X11/rgb AcceptCutText=0 AcceptPointerEvents=0 AcceptKeyEvents=0 >> $script_dir/Xvnc4-`hostname -s`:1.out 2>&1 -