Reorganize some files and import some others

This commit is contained in:
2015-01-14 15:14:22 +00:00
parent c03924f6a6
commit ecb0bb0815
29 changed files with 151 additions and 158 deletions

View File

@@ -1,25 +0,0 @@
FROM ubuntu:trusty
ENV MODE minimal
ENV HOST_ADDR 10.0.2.15
ENV HOST_PORT 8001
RUN apt-get install -y wget
RUN wget -q -P /build $HOST_ADDR:$HOST_PORT/config
RUN wget -q -P /build $HOST_ADDR:$HOST_PORT/init
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/prepare.sh | bash
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/cron.sh | bash
RUN mkdir -p /etc/service/cron
RUN wget -q -O /etc/service/cron/run $HOST_ADDR:$HOST_PORT/runit/cron
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/syslog.sh | bash
RUN mkdir -p /etc/service/syslog
RUN wget -q -O /etc/service/syslog/run $HOST_ADDR:$HOST_PORT/runit/syslog
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/sshd.sh | bash
RUN mkdir -p /etc/service/sshd
RUN wget -q -O /etc/service/sshd/run $HOST_ADDR:$HOST_PORT/runit/sshd
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/hosts.sh | bash
RUN wget -q -O /opt/init.d/01_hosts $HOST_ADDR:$HOST_PORT/boot/hosts.sh
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/init.sh | bash
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/runit.sh | bash
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/logrotate.sh | bash
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/utilities.sh | bash
RUN wget -q -O - $HOST_ADDR:$HOST_PORT/scripts/cleanup.sh | bash
CMD ["/opt/init"]

View File

@@ -1,19 +0,0 @@
ARGS="-v /root/.config/pulse:/root/.config/pulse"
DIR=`dirname $0`
DIR=`readlink -e $DIR`
BASE=`basename $DIR`
IFS='/' read -ra ADDR <<< "$DIR"
CONTAINER=${ADDR[-2]}
while : ; do
ID=`docker ps --no-trunc | grep $CONTAINER: | cut -d' ' -f1`
if [ -n "$ID" ]; then
break
fi
if [ ! -n "$STARTED" ]; then
echo "Starting container."
/opt/docker/bin/run $CONTAINER &
STARTED=yes
sleep 10
fi
done
/opt/docker/bin/ssh $CONTAINER $1 "source .profile; /opt/$CONTAINER"

View File

@@ -1,7 +0,0 @@
ARGS=""
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"

View File

@@ -1,24 +0,0 @@
ARGS=""
DIR=`dirname $0`
DIR=`readlink -e $DIR`
BASE=`basename $DIR`
IFS='/' read -ra ADDR <<< "$DIR"
CONTAINER=${ADDR[-2]}
ID=`docker ps --no-trunc | grep $CONTAINER: | cut -d' ' -f1`
if [ -n "$ID" ]; then
IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $ID`
COMMAND="ssh -X -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i id_rsa $ARGS root@$IP"
if [ ! -e id_rsa ]; then
docker cp $ID:/opt/id_rsa .
fi
if [ ! -z "$1" ] && [ "$1" == "-l" ]; then
DISPLAY=:0
chmod 0666 id_rsa
su user -c "$COMMAND \"$2\""
else
chmod 0600 id_rsa
eval "$COMMAND \"$1\""
fi
else
echo "Container is not running."
fi

View File

@@ -1,41 +0,0 @@
FROM ubuntu:precise
RUN apt-get update
RUN apt-get install -y wget gcc make
RUN wget http://ftp.us.debian.org/debian/pool/main/l/linux/linux-libc-dev_3.2.54-2_amd64.deb
RUN dpkg -i linux-libc-dev_3.2.54-2_amd64.deb
RUN apt-get install -y libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev
ENV PHP_VERSION 5.5.9
RUN cd /opt && \
wget http://uk1.php.net/get/php-$PHP_VERSION.tar.gz/from/this/mirror -O php-$PHP_VERSION.tar.gz && \
tar xzf php-$PHP_VERSION.tar.gz && \
cd php-$PHP_VERSION && \
./configure --enable-calendar --enable-bcmath --with-bz2 --enable-ctype --without-gdbm --with-iconv --enable-exif --enable-ftp --with-gettext --enable-mbstring --enable-sockets --with-zlib --enable-soap --enable-zip --with-mhash --with-curl --with-gd --with-mysql --with-jpeg-dir --with-openssl --with-mysqli --with-mcrypt && \
make && \
make install
#RUN chmod +x /opt/redis-$PHP_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-$PHP_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 80
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
CMD top

6
images/mysql.mk Normal file
View File

@@ -0,0 +1,6 @@
include $(DOCKER_HOME)/build/Makefile
NAME = mysql
VERSION = latest
build: base mysql

View File

@@ -1,25 +0,0 @@
FROM ubuntu:precise
RUN apt-get update
RUN apt-get install -y mysql-server
ENV VERSION stable
#RUN chmod +x /opt/redis-$VERSION/src/redis-server
ENV MYSQL_CONFIG /etc/mysql/my.cnf
ENV MYSQL_LOG /host/var/log/mysql/error.log
ENV MYSQL_DATA /host/var/lib/mysql
RUN sed -i "s,^\(log_error\s*=\s*\).*$,\1$MYSQL_LOG," $MYSQL_CONFIG
RUN sed -i "s,^\(datadir\s*=\s*\).*$,\1$MYSQL_DATA," $MYSQL_CONFIG
VOLUME [ "/host" ]
EXPOSE 3306
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

View File

@@ -0,0 +1,8 @@
<?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;

6
images/webserver.mk Normal file
View File

@@ -0,0 +1,6 @@
include $(DOCKER_HOME)/build/Makefile
NAME = webserver
VERSION = latest
build: base lighttpd-php