From c065a72a5d482aa8c0f3967c2d28e998d521294d Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Fri, 16 Jan 2015 11:33:35 +0000
Subject: [PATCH] Clean and reorganize some utility scripts

---
 bin/attach                       |  1 -
 bin/make                         |  5 +----
 bin/run                          | 32 +------------------------------
 images/btsync/Makefile           |  7 -------
 images/chrome/Makefile           |  6 ------
 images/firefox/Dockerfile        |  5 -----
 images/firefox/Makefile          |  6 ------
 images/firefox/bin/run           |  7 -------
 images/hamachi/Makefile          |  7 -------
 images/mpd/Makefile              |  7 -------
 images/phpmyadmin/config.inc.php |  8 --------
 images/redis/Dockerfile          | 33 --------------------------------
 images/redis/Makefile            |  7 -------
 13 files changed, 2 insertions(+), 129 deletions(-)
 delete mode 100644 bin/attach
 delete mode 100644 images/btsync/Makefile
 delete mode 100644 images/chrome/Makefile
 delete mode 100644 images/firefox/Dockerfile
 delete mode 100644 images/firefox/Makefile
 delete mode 100644 images/firefox/bin/run
 delete mode 100644 images/hamachi/Makefile
 delete mode 100644 images/mpd/Makefile
 delete mode 100644 images/phpmyadmin/config.inc.php
 delete mode 100644 images/redis/Dockerfile
 delete mode 100644 images/redis/Makefile

diff --git a/bin/attach b/bin/attach
deleted file mode 100644
index ee4900b..0000000
--- a/bin/attach
+++ /dev/null
@@ -1 +0,0 @@
-lxc-attach -n `docker ps --no-trunc | grep $1: | cut -d' ' -f1`
diff --git a/bin/make b/bin/make
index 5d1587b..508bcc6 100644
--- a/bin/make
+++ b/bin/make
@@ -1,4 +1 @@
-DIR=`pwd`
-cd /opt/docker/images/$1/
-make $2
-cd $DIR
+make -f $DOCKER_HOME/images/$1.mk $2
diff --git a/bin/run b/bin/run
index 0f042d7..39b8ec9 100644
--- a/bin/run
+++ b/bin/run
@@ -1,31 +1 @@
-#!/bin/bash
-# Arguments:
-# $1 = redirected ? -t : <image>
-# $2 = redirected ? <image> : <mode>
-# $3 = redirected ? <options> : <command>
-# When redirected:
-# $4 = <mode>
-# $5 = <command>
-if [ -n "$1" ] && [ $1 == "-t" ]; then
-    HOST_ADDR=`ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{print $1}'`
-    PARAMS="--rm -e HOST_ADDR=$HOST_ADDR $3 --name $2"
-    if [ -n "$4" ] && [ $4 == "-i" ]; then
-        # Run without services, provide shell
-        docker run $PARAMS -i -t $2 bash
-    elif [ -n "$4" ] && [ $4 == "-x" ]; then
-        # Run with services, provide shell
-        docker run $PARAMS -i -t $2 /opt/init -- bash -l
-    elif [ -n "$4" ] && [ $4 == "-c" ] && [ -n "$5" ]; then
-        # Run with services, provide shell
-        docker run $PARAMS -i -t $2 /opt/init -- $5
-    elif [ -n "$4" ] && [ $4 == "-w" ]; then
-        # Run without services
-        docker run $PARAMS $2
-    else
-        # Run with services
-        docker run $PARAMS $2 /opt/init
-    fi
-else
-    /opt/docker/bin/clean # > /dev/null 2>&1
-    /opt/docker/images/$1/bin/run $2 $3
-fi
+docker run -it $1 /bin/bash
diff --git a/images/btsync/Makefile b/images/btsync/Makefile
deleted file mode 100644
index a45f834..0000000
--- a/images/btsync/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-include /opt/docker/build/Makefile
-
-NAME = btsync
-VERSION = latest
-RUN = -p 8888:8888 -v /opt/docker/images/btsync/fs:/host
-
-build: base btsync
\ No newline at end of file
diff --git a/images/chrome/Makefile b/images/chrome/Makefile
deleted file mode 100644
index 63ff628..0000000
--- a/images/chrome/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-include /opt/docker/build/Makefile
-
-NAME = chrome
-VERSION = latest
-
-build: base pulseaudio chrome
\ No newline at end of file
diff --git a/images/firefox/Dockerfile b/images/firefox/Dockerfile
deleted file mode 100644
index 7cbfb1b..0000000
--- a/images/firefox/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM ubuntu:precise
-
-ADD build /build
-
-RUN for s in /build/scripts/*.sh; do [ -x $s ] && $s || : ; done
\ No newline at end of file
diff --git a/images/firefox/Makefile b/images/firefox/Makefile
deleted file mode 100644
index 4457f5a..0000000
--- a/images/firefox/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-include /opt/docker/build/Makefile
-
-NAME = firefox
-VERSION = latest
-
-build: base pulseaudio firefox
\ No newline at end of file
diff --git a/images/firefox/bin/run b/images/firefox/bin/run
deleted file mode 100644
index b9ab0bd..0000000
--- a/images/firefox/bin/run
+++ /dev/null
@@ -1,7 +0,0 @@
-ARGS="-v /tmp/.X11-unix:/tmp/.X11-unix -v /dev/shm:/dev/shm -v /run/user/${UID}/pulse:/run/user/${UID}/pulse"
-DIR=`dirname $0`
-DIR=`readlink -e $DIR`
-BASE=`basename $DIR`
-IFS='/' read -ra ADDR <<< "$DIR"
-CONTAINER=${ADDR[-2]}
-/opt/docker/bin/run -t $CONTAINER "$ARGS" $1 "$2"
diff --git a/images/hamachi/Makefile b/images/hamachi/Makefile
deleted file mode 100644
index 37f92dd..0000000
--- a/images/hamachi/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-include /opt/docker/build/Makefile
-
-NAME = hamachi
-VERSION = latest
-RUN = --privileged -v /opt/docker/images/hamachi/fs:/host
-
-build: base hamachi
\ No newline at end of file
diff --git a/images/mpd/Makefile b/images/mpd/Makefile
deleted file mode 100644
index 4645410..0000000
--- a/images/mpd/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-include /opt/docker/build/Makefile
-
-NAME = mpd
-VERSION = latest
-RUN = -p 6600:6600 -p 8000:8000
-
-build: base pulseaudio mpd
\ No newline at end of file
diff --git a/images/phpmyadmin/config.inc.php b/images/phpmyadmin/config.inc.php
deleted file mode 100644
index 48fc95d..0000000
--- a/images/phpmyadmin/config.inc.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$cfg['blowfish_secret'] = 'a8b7c6d';
-$cfg['Servers'][1]['auth_type'] = 'cookie';
-$cfg['Servers'][1]['connect_type'] = 'tcp';
-$cfg['Servers'][1]['host'] = 'mysql';
-$cfg['Servers'][1]['compress'] = false;
-$cfg['Servers'][1]['extension'] = 'mysqli';
-$cfg['Servers'][1]['AllowNoPassword'] = true;
diff --git a/images/redis/Dockerfile b/images/redis/Dockerfile
deleted file mode 100644
index 5d90000..0000000
--- a/images/redis/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM ubuntu:precise
-
-RUN apt-get update
-RUN apt-get install -y wget gcc make
-
-ENV REDIS_VERSION stable
-
-RUN cd /opt && \
-    wget http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz && \
-    tar xzf redis-$REDIS_VERSION.tar.gz && \
-    cd redis-$REDIS_VERSION && \
-    make
-
-RUN chmod +x /opt/redis-$REDIS_VERSION/src/redis-server
-
-ENV REDIS_CONFIG /etc/redis/redis-server.conf
-ENV REDIS_LOG /host/var/log/redis/redis-server.log
-ENV REDIS_DATA /host/var/lib/redis
-
-RUN mkdir -p `dirname $REDIS_CONFIG`
-RUN cp /opt/redis-$REDIS_VERSION/redis.conf $REDIS_CONFIG
-RUN sed -i "s,^\(logfile\s*\).*$,\1$REDIS_LOG," $REDIS_CONFIG
-RUN sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG
-
-VOLUME [ "/host" ]
-EXPOSE 6379
-
-ENV LD_LIBRARY_PATH /root/lib
-RUN mkdir $LD_LIBRARY_PATH
-RUN cp /lib/x86_64-linux-gnu/libnss_files.so.2 $LD_LIBRARY_PATH
-RUN perl -pi -e 's:/etc/hosts:/tmp/hosts:g' $LD_LIBRARY_PATH/libnss_files.so.2
-
-CMD /host/bin/run
\ No newline at end of file
diff --git a/images/redis/Makefile b/images/redis/Makefile
deleted file mode 100644
index 1704c83..0000000
--- a/images/redis/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-include /opt/docker/build/Makefile
-
-NAME = redis
-VERSION = latest
-RUN = -p 6379:6379 -v /opt/docker/images/$CONTAINER/fs:/host
-
-build: base redis
\ No newline at end of file