From 5ed77085a76dc338362c52c947e44655507b6571 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Sat, 14 May 2016 20:18:34 +0100 Subject: [PATCH] delete unused or test files --- build/make/chrome.mk | 2 - build/make/firefox.mk | 2 - build/make/ftp.mk | 2 - build/make/user.mk | 2 - build/scripts/firefox.sh | 11 ---- build/scripts/ftp.sh | 11 ---- build/scripts/testing.sh | 1 - build/scripts/user.sh | 7 -- images/chrome.mk | 6 -- images/firefox.mk | 6 -- images/mpd.mk | 6 -- images/webmo/build | 12 ---- images/webmo/gaussian.int | 17 ----- images/webmo/globals.int | 52 --------------- test | 7 -- todo.txt | 130 -------------------------------------- 16 files changed, 274 deletions(-) delete mode 100644 build/make/chrome.mk delete mode 100644 build/make/firefox.mk delete mode 100644 build/make/ftp.mk delete mode 100644 build/make/user.mk delete mode 100644 build/scripts/firefox.sh delete mode 100644 build/scripts/ftp.sh delete mode 100644 build/scripts/testing.sh delete mode 100644 build/scripts/user.sh delete mode 100644 images/chrome.mk delete mode 100644 images/firefox.mk delete mode 100644 images/mpd.mk delete mode 100644 images/webmo/build delete mode 100644 images/webmo/gaussian.int delete mode 100644 images/webmo/globals.int delete mode 100644 test delete mode 100644 todo.txt diff --git a/build/make/chrome.mk b/build/make/chrome.mk deleted file mode 100644 index 17a8fad..0000000 --- a/build/make/chrome.mk +++ /dev/null @@ -1,2 +0,0 @@ -chrome: - $(call script,$@) \ No newline at end of file diff --git a/build/make/firefox.mk b/build/make/firefox.mk deleted file mode 100644 index 1438e8a..0000000 --- a/build/make/firefox.mk +++ /dev/null @@ -1,2 +0,0 @@ -firefox: user - $(call script,$@) \ No newline at end of file diff --git a/build/make/ftp.mk b/build/make/ftp.mk deleted file mode 100644 index 513f512..0000000 --- a/build/make/ftp.mk +++ /dev/null @@ -1,2 +0,0 @@ -ftp: - $(call script,$@) \ No newline at end of file diff --git a/build/make/user.mk b/build/make/user.mk deleted file mode 100644 index f6e103f..0000000 --- a/build/make/user.mk +++ /dev/null @@ -1,2 +0,0 @@ -user: - $(call script,$@) \ No newline at end of file diff --git a/build/scripts/firefox.sh b/build/scripts/firefox.sh deleted file mode 100644 index e4a3ed9..0000000 --- a/build/scripts/firefox.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e -source /build/config -set -x - -## Chrome dependencies -apt_install_permanent firefox - -## Pulseaudio script -echo "PULSE_SERVER=host firefox" > /opt/firefox -chmod +x /opt/firefox diff --git a/build/scripts/ftp.sh b/build/scripts/ftp.sh deleted file mode 100644 index d549cc2..0000000 --- a/build/scripts/ftp.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e -source /build/config -set -x - -## Environment -export_env FTP_DATA /host/var/lib/ftp - -## Pure-FTPd -apt update -apt_install_permanent pure-ftpd diff --git a/build/scripts/testing.sh b/build/scripts/testing.sh deleted file mode 100644 index 50504b2..0000000 --- a/build/scripts/testing.sh +++ /dev/null @@ -1 +0,0 @@ -#!/bin/bash set -e source /build/config set -x ## Environment echo "test" \ No newline at end of file diff --git a/build/scripts/user.sh b/build/scripts/user.sh deleted file mode 100644 index bb62e14..0000000 --- a/build/scripts/user.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e -source /build/config -set -x - -## User -adduser --disabled-password --gecos "" user diff --git a/images/chrome.mk b/images/chrome.mk deleted file mode 100644 index ff27ae5..0000000 --- a/images/chrome.mk +++ /dev/null @@ -1,6 +0,0 @@ -include $(DOCKER_HOME)/build/Makefile - -NAME = chrome -VERSION = latest - -build: pulseaudio chrome \ No newline at end of file diff --git a/images/firefox.mk b/images/firefox.mk deleted file mode 100644 index f3fcb61..0000000 --- a/images/firefox.mk +++ /dev/null @@ -1,6 +0,0 @@ -include $(DOCKER_HOME)/build/Makefile - -NAME = firefox -VERSION = latest - -build: pulseaudio firefox \ No newline at end of file diff --git a/images/mpd.mk b/images/mpd.mk deleted file mode 100644 index 4cce8b4..0000000 --- a/images/mpd.mk +++ /dev/null @@ -1,6 +0,0 @@ -include $(DOCKER_HOME)/build/Makefile - -NAME = mpd -VERSION = latest - -build: pulseaudio mpd \ No newline at end of file diff --git a/images/webmo/build b/images/webmo/build deleted file mode 100644 index 892c36c..0000000 --- a/images/webmo/build +++ /dev/null @@ -1,12 +0,0 @@ -/opt/docker/bin/build lighttpd -DIR=`dirname $0` -DIR=`readlink -e $DIR` -BASE=`basename $DIR` -IFS='/' read -ra ADDR <<< "$DIR" -CONTAINER=${ADDR[-2]} -echo $DIR -cp "/media/mercury/Software/Install/Science/Gaussian/Gaussian 09 Unix.tgz" ${DIR}/../gaussian.tgz -cp "/media/mercury/Software/Install/Science/WebMO/WebMO.14.0.006.tar.gz" ${DIR}/../webmo.tgz -docker build -t $CONTAINER ${DIR}/../ -rm ${DIR}/../gaussian.tgz -rm ${DIR}/../webmo.tgz \ No newline at end of file diff --git a/images/webmo/gaussian.int b/images/webmo/gaussian.int deleted file mode 100644 index 8059eda..0000000 --- a/images/webmo/gaussian.int +++ /dev/null @@ -1,17 +0,0 @@ -interfaceDescription{'gaussian'}="Ab initio and semi-empirical calculations" -interfaceDescription{'gaussian_admin'}="Edit preferences specific to Gaussian" -interfaceDescription{'gaussian_name'}="Gaussian" -gaussianVersion="g09" -gaussianBase="/opt/g09" -gaussianRoot="/opt" -GAUSS_EXEDIR="/opt/g09/bsd:/opt/g09/private:/opt/g09" -GMAIN="/opt/g09/bsd:/opt/g09/private:/opt/g09" -LD_LIBRARY_PATH="/opt/g09/bsd:/opt/g09/private:/opt/g09" -gaussianBasis="/opt/g09/basis" -nodesMin="1" -nodesMax="1" -nodesDefault="1" -ppnMin="1" -ppnMax="1" -ppnDefault="1" -nodeTypeDefault="" diff --git a/images/webmo/globals.int b/images/webmo/globals.int deleted file mode 100644 index 0fd46dd..0000000 --- a/images/webmo/globals.int +++ /dev/null @@ -1,52 +0,0 @@ -catPath="/bin/cat" -cgiBase="/opt/webmo/source/cgi-bin" -chmodPath="/bin/chmod" -chownPath="/bin/chown" -cpOptions="-r" -cpPath="/bin/cp" -externalAuthentication="" -externalBatchQueue="" -host="" -htmlBase="/opt/webmo/source" -killPath="/bin/kill" -license="1207-1902-5611" -loginMsg="" -loginMsgTimestamp="" -mkdirPath="/bin/mkdir" -mvPath="/bin/mv" -ncores="1" -owner="Computational Chemistry on the WWW" -perlPath="/usr/bin/perl" -psOptions="-ef" -psPath="/bin/ps" -psRegExp="(\$pid, \$ppid, \$cpu_time) = /.{8}(.{6})(.{6}).{3}.{6}.{2}(.{16}).*/" -rcpPath="" -rmOptions="-rf" -rmPath="/bin/rm" -rshPath="" -scpOptions="" -scpPath="" -sendmailOptions="-t" -sendmailPath="" -servers=",0" -sshOptions="" -sshPath="" -sudoEnabled="" -sudoPath="/usr/bin/sudo" -systemScratch="/tmp" -tarOptions="cf" -tarPath="/bin/tar" -unamePath="/bin/uname" -uniqueId="39" -unzipPath="" -url_cgiBase="/cgi-bin" -url_htmlBase="" -userBase="/host/var/webmo" -userStorageEnabled="" -version="14.0.006" -webserver="" -webserverProtocol="" -whereisPath="/usr/bin/whereis" -zcatPath="/bin/zcat" -zipOptions="-r -q" -zipPath="" diff --git a/test b/test deleted file mode 100644 index eee9344..0000000 --- a/test +++ /dev/null @@ -1,7 +0,0 @@ -docker run -t -i -n=false \ - --lxc-conf="lxc.network.type = veth" \ - --lxc-conf="lxc.network.flags = up" \ - --lxc-conf="lxc.network.link = br0" \ - --lxc-conf="lxc.network.ipv4 = 10.0.2.123" \ - --lxc-conf="lxc.network.ipv4.gateway=10.0.2.15" \ - hamachi /bin/bash diff --git a/todo.txt b/todo.txt deleted file mode 100644 index 8bb894a..0000000 --- a/todo.txt +++ /dev/null @@ -1,130 +0,0 @@ -ftp: - RUN apt-get install -y vsftpd - ENV FTP_CONFIG /etc/vsftpd.conf - -mpd: - RUN apt-get install mpd -y - ENV MPD_CONFIG /etc/mpd.conf - -redis: - RUN apt-get install redis-server - - ENV REDIS_CONFIG /etc/redis/redis.conf - ENV REDIS_LOG /host/var/log/redis/redis.log - ENV REDIS_DATA /host/var/lib/redis - - RUN sed -i "s,^\(daemonize\s*\).*$,\1no," $REDIS_CONFIG - RUN sed -i "s,^\(logfile\s*\).*$,\1$REDIS_LOG," $REDIS_CONFIG - RUN sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG - -shipyard: - RUN cd /opt && \ - git clone https://github.com/shipyard/shipyard.git - - RUN curl https://raw.github.com/pypa/pip/master/contrib/get-pip.py | python - - RUN cd /opt/shipyard && \ - pip install -r requirements.txt || true - - ENV SHIPYARD_CONFIG /opt/shipyard/shipyard/settings.py - ENV SHIPYARD_DB /host/var/lib/shipyard/shipyard.db - - RUN sed -i "s;^\(\s*'NAME':\s*\).*$;\1'$SHIPYARD_DB',;" $SHIPYARD_CONFIG - - mkdir -p `dirname $SHIPYARD_DB` - touch $SHIPYARD_DB - - /opt/shipyard/manage.py syncdb --noinput - /opt/shipyard/manage.py migrate - /opt/shipyard/manage.py update_admin_user --username=admin --password=kreeft - /opt/shipyard/manage.py runserver 0.0.0.0:8000 - -minidlna: - RUN apt-get install -y gettext libavutil-dev libavcodec-dev libavformat-dev libjpeg-dev libsqlite3-dev libexif-dev libid3tag0-dev libogg-dev libvorbis-dev libFLAC-dev - - ENV MINIDLNA_VERSION 1.1.3 - ENV MINIDLNA_CONFIG /host/etc/minidlna.conf - ENV MINIDLNA_LOG /host/var/log/minidlna.log - ENV MINIDLNA_DATA /host/var/lib/minidlna - - RUN cd /opt && \ - wget http://downloads.sourceforge.net/project/minidlna/minidlna/$MINIDLNA_VERSION/minidlna-$MINIDLNA_VERSION.tar.gz && \ - tar xzf minidlna-$MINIDLNA_VERSION.tar.gz - RUN cd /opt/minidlna-$MINIDLNA_VERSION && \ - ./configure && \ - make && \ - make install - - mkdir -p $MINIDLNA_DATA - /usr/local/sbin/minidlnad -d -f $MINIDLNA_CONFIG >> $MINIDLNA_LOG - - /opt/docker/bin/run -t $CONTAINER " - -p 8200:8200 - -p 8200:8200/udp - -v /opt/docker/images/$CONTAINER/fs/bin:/host/bin - -v /opt/docker/images/$CONTAINER/fs/var:/host/var - -v /opt/docker/images/$CONTAINER/fs/etc:/host/etc - -v /media/neptune/Music:/host/srv/audio - -v /media/helios/Photographs:/host/srv/pictures - -v /media/neptune/Video:/host/srv/video" $1 - # -p 1900:1900/udp - /opt/docker/bin/run -t $CONTAINER " - -v /opt/docker/images/$CONTAINER/fs/bin:/host/bin - -v /opt/docker/images/$CONTAINER/fs/var:/host/var - -v /opt/docker/images/$CONTAINER/fs/etc:/host/etc - -v /media/neptune/Music:/host/srv/audio - -v /media/helios/Photographs:/host/srv/pictures - -v /media/neptune/Video:/host/srv/video" \ - -d -n=false \ - -lxc-conf="lxc.network.type = veth" \ - -lxc-conf="lxc.network.flags = up" \ - -lxc-conf="lxc.network.link = eth0" \ - -lxc-conf="lxc.network.ipv4 = 192.168.1.151" \ - -lxc-conf="lxc.network.ipv4.gateway=192.168.1.1" $1 - -shipyard: - RUN apt-get install -y multiarch-support binutils-multiarch - RUN dpkg --add-architecture i386 - RUN apt-get update - RUN apt-get install -y libX11-6:i386 libgdk-pixbuf2.0-0:i386 \ - libgtk2.0-0:i386 libsqlite3-0:i386 - - #RUN apt-get install -y ia32-libs - #RUN apt-get install -y ia32-libs-gtk - -syncovery: - RUN cd /opt && \ - wget http://www.superflexible.com/SuperFlexibleLinux.tar.gz && \ - tar xzf SuperFlexibleLinux.tar.gz && \ - rm SuperFlexibleLinux.tar.gz - RUN chmod +x /opt/SuperFlexibleSynchronizer - - RUN apt-get install -y openssh-server net-tools - /opt/SuperFlexibleSynchronizer - -webmo: - RUN apt-get install -y csh - - ADD gaussian.tgz /opt - - ENV GAUSS_EXEDIR /opt/g09 - RUN cd $GAUSS_EXEDIR && \ - ./bsd/install - - ADD webmo.tgz /opt - RUN mv /opt/WebMO.install /opt/webmo - RUN ln -s /host/etc/webmo/globals.int /opt/webmo/cgi-bin/interfaces/ - RUN ln -s /host/etc/webmo/gaussian.int /opt/webmo/cgi-bin/interfaces/ - RUN ln -s /opt/webmo/scripts/secure.pl /opt/webmo/cgi-bin/ - RUN sed -i 's,$webserverProtocol://${webserver},,' /opt/webmo/cgi-bin/redirect.cgi - RUN usermod -G root www-data - -pyopenssl: - install gcc libpython-dev libffi-dev libssl-dev - pip install git+git://github.com/pyca/pyopenssl.git - -misc: - /opt/init --skip-runit sleep infinity - - ARGS="-v /root/.config/pulse:/root/.config/pulse" - ARGS="-v /tmp/.X11-unix:/tmp/.X11-unix -v /dev/shm:/dev/shm -v /run/user/${UID}/pulse:/run/user/${UID}/pulse" \ No newline at end of file