Updated Structure, Updated Versions, Removed Shell Hack, Changed Init…

… Structure

README.md

@@ -35,30 +35,30 @@ The following commands can be used to deploy some of the services offered by the
 
     - **Adminer**
 
-            docker run --name="adminer" -d --link mariadb:mariadb --link postgresql:postgresql -e VIRTUAL_HOST=adminer.example.com maxexcloo/adminer
+            docker run --env=[VIRTUAL_HOST=adminer.example.com] --link=[mariadb:mariadb, postgresql:postgresql] --name="adminer" -d maxexcloo/adminer
 
     - **Koken**
 
             docker run --name="koken-data" maxexcloo/data
-            docker run --name="koken" -it --link mariadb:mariadb --volumes-from="koken-data" -e VIRTUAL_HOST=koken.example.com -h koken.example.com maxexcloo/koken
+            docker run --env=[VIRTUAL_HOST=koken.example.com] --link=[mariadb:mariadb] --name="koken" --volumes-from=[koken-data] -it maxexcloo/koken
 
     - **phpMyAdmin**
 
-            docker run --name="phpmyadmin" -d --link mariadb:mariadb -e VIRTUAL_HOST=phpmyadmin.example.com maxexcloo/phpmyadmin
+            docker run --name="phpmyadmin" -d --link mariadb:mariadb --env=VIRTUAL_HOST=phpmyadmin.example.com maxexcloo/phpmyadmin
 
     - **phpPgAdmin**
 
-            docker run --name="phppgadmin" -d --link postgresql:postgresql -e VIRTUAL_HOST=phppgadmin.example.com maxexcloo/phppgadmin
+            docker run --name="phppgadmin" -d --link postgresql:postgresql --env=VIRTUAL_HOST=phppgadmin.example.com maxexcloo/phppgadmin
 
     - **Tiny Tiny RSS**
 
             docker run --name="tiny-tiny-rss-data" maxexcloo/data
-            docker run --name="tiny-tiny-rss" -it --link postgresql:postgresql --volumes-from="tiny-tiny-rss-data" -e VIRTUAL_HOST=tiny-tiny-rss.example.com maxexcloo/tiny-tiny-rss
+            docker run --name="tiny-tiny-rss" -it --link postgresql:postgresql --volumes-from="tiny-tiny-rss-data" --env=VIRTUAL_HOST=tiny-tiny-rss.example.com maxexcloo/tiny-tiny-rss
 
     - **Wordpress**
 
             docker run --name="wordpress-data" maxexcloo/data
-            docker run --name="wordpress" -it --link mariadb:mariadb --volumes-from="wordpress-data" -e VIRTUAL_HOST=wordpress.example.com maxexcloo/wordpress
+            docker run --name="wordpress" -it --link mariadb:mariadb --volumes-from="wordpress-data" --env=VIRTUAL_HOST=wordpress.example.com maxexcloo/wordpress
 
 - **Base**
 
@@ -83,22 +83,22 @@ The following commands can be used to deploy some of the services offered by the
     - **Apache**
 
             docker run --name="apache-data" maxexcloo/data
-            docker run --name="apache" -it --volumes-from="apache-data" -e VIRTUAL_HOST=example.com,www.example.com maxexcloo/apache
+            docker run --name="apache" -it --volumes-from="apache-data" --env=VIRTUAL_HOST=example.com,www.example.com maxexcloo/apache
 
     - **Apache + PHP**
 
             docker run --name="apache-php-data" maxexcloo/data
-            docker run --name="apache-php" -it --volumes-from="apache-php-data" -e VIRTUAL_HOST=example.com,www.example.com maxexcloo/apache-php
+            docker run --name="apache-php" -it --volumes-from="apache-php-data" --env=VIRTUAL_HOST=example.com,www.example.com maxexcloo/apache-php
 
     - **Nginx**
 
             docker run --name="nginx-data" maxexcloo/data
-            docker run --name="nginx" -it --volumes-from="nginx-data" -e VIRTUAL_HOST=example.com,www.example.com maxexcloo/nginx
+            docker run --name="nginx" -it --volumes-from="nginx-data" --env=VIRTUAL_HOST=example.com,www.example.com maxexcloo/nginx
 
     - **Nginx + PHP-FPM**
 
             docker run --name="nginx-php-data" maxexcloo/data
-            docker run --name="nginx-php" -it --volumes-from="nginx-php-data" -e VIRTUAL_HOST=example.com,www.example.com maxexcloo/nginx-php
+            docker run --name="nginx-php" -it --volumes-from="nginx-php-data" --env=VIRTUAL_HOST=example.com,www.example.com maxexcloo/nginx-php
 
 - **Services**
 
@@ -125,7 +125,7 @@ The following commands can be used to deploy some of the services offered by the
     - **Minecraft**
 
             docker run --name="minecraft-data" maxexcloo/data
-            docker run --name="minecraft" -it --volumes-from="minecraft-data" -e MEMORY=1024 -p 25565:25565 maxexcloo/minecraft
+            docker run --name="minecraft" -it --volumes-from="minecraft-data" --env=MEMORY=1024 -p 25565:25565 maxexcloo/minecraft
 
     - **PostgreSQL**
 
@@ -140,7 +140,7 @@ The following commands can be used to deploy some of the services offered by the
     - **ZNC**
 
             docker run --name="znc-data" maxexcloo/data
-            docker run --name="znc" -it --volumes-from="znc-data" -e VIRTUAL_HOST=znc.example.com -e VIRTUAL_PORT=6667 -p 6697:6697 -p 6667:6667 maxexcloo/znc
+            docker run --name="znc" -it --volumes-from="znc-data" --env=VIRTUAL_HOST=znc.example.com --env=VIRTUAL_PORT=6667 -p 6697:6697 -p 6667:6667 maxexcloo/znc
 
 **Testing**  
     docker run -it --rm=true -p 5050:5050 maxexcloo/couchpotato

applications/koken/Dockerfile

@@ -1,3 +1,3 @@
 FROM maxexcloo/nginx-php:latest
 MAINTAINER Max Schaefer <max@excloo.com>
-ADD init /config/init/04koken
+ADD config /config

applications/phpmyadmin/Dockerfile

@@ -1,6 +1,6 @@
 FROM maxexcloo/nginx-php:latest
 MAINTAINER Max Schaefer <max@excloo.com>
-ENV VERSION 4.2.8.1
+ENV VERSION 4.2.10
 RUN mkdir -p /data/http
 WORKDIR /data/http
 RUN wget -O - "http://www.sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.gz/download" | tar --strip-components=1 -x -z

applications/tiny-tiny-rss/Dockerfile

@@ -2,5 +2,4 @@ FROM maxexcloo/nginx-php:latest
 MAINTAINER Max Schaefer <max@excloo.com>
 ENV VERSION 1.13
 ADD config /config
-ADD init /config/init/04tiny-tiny-rss
 ADD supervisord.conf /etc/supervisor/conf.d/tiny-tiny-rss.conf

applications/tiny-tiny-rss/init → applications/tiny-tiny-rss/config/init04

@@ -2,5 +2,6 @@ if [ ! "$(ls -A /data/http)" ]; then
 	cd /data/http
 	wget -O - "https://www.github.com/gothfox/Tiny-Tiny-RSS/archive/${VERSION}.tar.gz" | tar --strip-components=1 -x -z Tiny-Tiny-RSS-${VERSION}
 	rm -rf *.md *.pot */*/.empty */.empty .buildpath .gitignore .htaccess .project LICENSE utils
-	cp -R /config/data /data
+	cp -R /config/config /data/config
+	cp -R /config/http /data/http
 fi

base/debian/Dockerfile

@@ -1,14 +1,14 @@
 FROM debian:latest
 MAINTAINER Max Schaefer <max@excloo.com>
 ADD etc /etc
-CMD /config/loop
 ENV DEBIAN_FRONTEND noninteractive
-RUN useradd -u 500 core
 RUN apt-get update
 RUN apt-get upgrade -y
-RUN apt-get install -y ca-certificates inotify-tools nano pwgen supervisor tmux unzip wget
+RUN apt-get install -y ca-certificates inotify-tools nano pwgen supervisor unrar unzip wget
 RUN apt-get clean
-ADD init /config/init/01debian
+RUN mkdir /config /data
+RUN useradd -u 500 core
+ADD init /config/init01
 ADD loop /config/loop
 RUN chmod +x /config/loop
-RUN mkdir -p /config/data /config/init /data /var/log/supervisor
+CMD /config/loop

base/debian/loop

@@ -1,16 +1,5 @@
 #!/bin/bash
-if [ "$(ls -A /config/init)" ]; then
-	for init in /config/init/*; do
-		bash "$init"
-	done
-fi
-if tty -s; then
-	supervisord
-	while true; do
-		echo "Exit supervisorctl with Ctrl-D. Detach with Ctrl-P + Ctrl-Q."
-		supervisorctl
-		echo "Exit shell with Ctrl-D. Detach with Ctrl-P + Ctrl-Q."
-		bash
-	done
-fi
+for init in /config/init*; do
+	bash "$init"
+done
 supervisord -n

base/ubuntu/Dockerfile

@@ -1,14 +1,14 @@
 FROM ubuntu:latest
 MAINTAINER Max Schaefer <max@excloo.com>
 ADD etc /etc
-CMD /config/loop
 ENV DEBIAN_FRONTEND noninteractive
-RUN useradd -u 500 core
 RUN apt-get update
 RUN apt-get upgrade -y
-RUN apt-get install -y ca-certificates inotify-tools nano pwgen supervisor tmux unzip wget
+RUN apt-get install -y ca-certificates inotify-tools nano pwgen supervisor unrar unzip wget
 RUN apt-get clean
-ADD init /config/init/01ubuntu
+RUN mkdir /config /data
+RUN useradd -u 500 core
+ADD init /config/init01
 ADD loop /config/loop
 RUN chmod +x /config/loop
-RUN mkdir -p /config/data /config/init /data /var/log/supervisor
+CMD /config/loop

base/ubuntu/loop

@@ -1,16 +1,5 @@
 #!/bin/bash
-if [ "$(ls -A /config/init)" ]; then
-	for init in /config/init/*; do
-		bash "$init"
-	done
-fi
-if tty -s; then
-	supervisord
-	while true; do
-		echo "Exit supervisorctl with Ctrl-D. Detach with Ctrl-P + Ctrl-Q."
-		supervisorctl
-		echo "Exit shell with Ctrl-D. Detach with Ctrl-P + Ctrl-Q."
-		bash
-	done
-fi
+for init in /config/init*; do
+	bash "$init"
+done
 supervisord -n

frameworks/nginx-php/etc/php5/fpm/pool.d/default.conf

@@ -1,8 +1,8 @@
 [default]
-user = www-data
-group = www-data
+user = core
+group = core
 listen = /data/secure/php5-fpm.sock
-listen.owner = www-data
+listen.owner = core
 pm = ondemand
 pm.max_children = 4
 php_flag[expose_php] = off

frameworks/nginx/config/init/02nginx → frameworks/nginx/config/init02

@@ -1,2 +1,3 @@
 mkdir -p /data/config /data/http /data/logs /data/secure
+chown -R core:core /data
 chmod 0770 /data/secure

frameworks/nginx/etc/nginx/host.d/default.conf

@@ -1,6 +1,5 @@
 server {
 	listen [::]:80 default_server ipv6only=off;
-	server_name _;
 	root /data/http;
 	include /etc/nginx/addon.d/default-*.conf;
 	include /etc/nginx/conf.d/*.conf;

frameworks/nginx/etc/nginx/nginx.conf

@@ -1,6 +1,6 @@
 daemon off;
 pid /var/run/nginx.pid;
-user www-data;
+user core;
 worker_processes auto;
 
 events {

frameworks/nodejs/Dockerfile

@@ -1,6 +1,6 @@
 FROM maxexcloo/debian:latest
 MAINTAINER Max Schaefer <max@excloo.com>
 ENV PATH $PATH:/opt/nodejs/bin
-ENV VERSION v0.10.31
-RUN mkdir -p /opt/nodejs
+ENV VERSION v0.10.32
+RUN mkdir /opt/nodejs
 RUN wget -O - "http://www.nodejs.org/dist/${VERSION}/node-${VERSION}-linux-x64.tar.gz" | tar --directory=/opt/nodejs --strip-components=1 -x -z

services/dnsmasq/Dockerfile

@@ -1,7 +1,7 @@
 FROM maxexcloo/debian:latest
 MAINTAINER Max Schaefer <max@excloo.com>
 RUN apt-get install -y dnsmasq iptables
+ADD config /config
 ADD etc /etc
-ADD init /config/init/03dnsmasq
 ADD supervisord.conf /etc/supervisor/conf.d/dnsmasq.conf
 EXPOSE 53

services/dnsmasq/init → services/dnsmasq/config/init03

@@ -1,2 +1,2 @@
 mkdir -p /data/dnsmasq /data/iptables
-touch /data/iptables/iptables.rules
+touch /data/iptables/iptables

services/dnsmasq/etc/dnsmasq.conf

@@ -4,5 +4,5 @@ no-poll
 no-resolv
 server=8.8.8.8
 server=8.8.4.4
-user=daemon
+user=core
 conf-dir=/data/dnsmasq

services/dnsmasq/supervisord.conf

@@ -5,7 +5,7 @@ command=dnsmasq -d
 command=bash -c "while inotifywait -e create,modify,move -q /data/dnsmasq/; do supervisorctl restart dnsmasq; done"
 
 [program:iptables]
-command=bash -c "iptables-restore < /data/iptables/iptables.rules"
+command=bash -c "iptables-restore < /data/iptables/iptables"
 
 [program:iptables-config]
 command=bash -c "while inotifywait -e create,modify,move -q /data/iptables/; do supervisorctl restart iptables; done"

services/haproxy-config/config/data/haproxy.tmpl → services/haproxy-config/config/haproxy.tmpl

@@ -1,6 +1,6 @@
 global
-	user haproxy
-	group haproxy
+	user core
+	group core
 	maxconn 1024
 	pidfile /var/run/haproxy.pid
 
@@ -10,17 +10,19 @@ defaults
 	option abortonclose
 	option forwardfor
 	option http-server-close
+	ssl-default-bind-ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
 	stats enable
 	stats hide-version
 	stats refresh 5s
 	stats uri /haproxy
 	timeout client 60s
 	timeout connect 60s
 	timeout server 60s
+	tune.ssl.default-dh-param 2048
 
 frontend http
 	bind :80
-	bind :443 ssl crt /data/cert/ ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK
+	bind :443 ssl no-sslv3 crt /data/cert/
 {{range $host, $containers := groupByMulti $ "Env.VIRTUAL_HOST" ","}}
 	use_backend http_{{$host}} if { hdr(host) -i {{$host}} }
 	use_backend http_{{$host}} if { ssl_fc_sni {{$host}} }

services/haproxy-config/supervisord.conf

@@ -1,2 +1,2 @@
 [program:docker-gen]
-command=docker-gen -only-exposed -watch /config/data/haproxy.tmpl /data/haproxy.cfg
+command=docker-gen -only-exposed -watch /config/haproxy.tmpl /data/haproxy.cfg

services/haproxy/Dockerfile

@@ -6,7 +6,7 @@ RUN echo "deb http://cdn.debian.net/debian/ wheezy-backports main" > /etc/apt/so
 RUN echo "deb http://haproxy.debian.net/ wheezy-backports main" > /etc/apt/sources.list.d/haproxy.list
 RUN apt-get update
 RUN apt-get install -t wheezy-backports -y haproxy
-ADD init /config/init/03haproxy
+ADD config /config
 ADD supervisord.conf /etc/supervisor/conf.d/haproxy.conf
 EXPOSE 80
 EXPOSE 443

services/mariadb/Dockerfile

@@ -9,6 +9,6 @@ RUN apt-get install -y mariadb-server
 RUN sed -i -e "s/^bind-address/#bind-address/" /etc/mysql/my.cnf
 RUN sed -i -e "s/^datadir.*=.*/datadir = \/data/" /etc/mysql/my.cnf
 RUN sed -i -e "s/^innodb_buffer_pool_size.*=.*/innodb_buffer_pool_size = 64M/" /etc/mysql/my.cnf
-ADD init /config/init/03mariadb
+ADD config /config
 ADD supervisord.conf /etc/supervisor/conf.d/mariadb.conf
 EXPOSE 3306

services/minecraft/Dockerfile

@@ -2,7 +2,7 @@ FROM maxexcloo/java:latest
 MAINTAINER Max Schaefer <max@excloo.com>
 ENV MEMORY 1024
 ENV VERSION 1.7.10
-ADD init /config/init/03minecraft
+ADD config /config
 ADD supervisord.conf /etc/supervisor/conf.d/minecraft.conf
 EXPOSE 25565
 EXPOSE 25575

services/openvpn/Dockerfile

@@ -2,8 +2,6 @@ FROM maxexcloo/debian:latest
 MAINTAINER Max Schaefer <max@excloo.com>
 RUN apt-get install -y curl iptables openvpn socat
 ADD config /config
-ADD bin /bin
-ADD init /config/init/03openvpn
 ADD supervisord.conf /etc/supervisor/conf.d/openvpn.conf
 EXPOSE 25
 EXPOSE 110

services/openvpn/init → services/openvpn/config/init03

@@ -4,7 +4,7 @@ cd /data
 IP=$(curl -s http://myip.enix.org/REMOTE_ADDR)
 
 if [ ! "$(ls -A /data)" ]; then
-	openssl dhparam -out dh.pem 2048
+	openssl dhparam -out dh.pem
 	openssl genrsa -out openvpn.key 2048
 	openssl req -new -subj /CN=OpenVPN/ -key openvpn.key -out openvpn.csr
 	openssl x509 -req -in openvpn.csr -out openvpn.pem -signkey openvpn.key -days 3650

services/postgresql/Dockerfile

@@ -9,6 +9,6 @@ RUN apt-get install -y postgresql-9.3
 RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/9.3/main/pg_hba.conf
 RUN sed -i -e "s/^#listen_addresses.*=.*/listen_addresses = '*'/" /etc/postgresql/9.3/main/postgresql.conf
 RUN sed -i -e "s/^data_directory.*=.*$/data_directory = '\/data'/" /etc/postgresql/9.3/main/postgresql.conf
-ADD init /config/init/03postgresql
+ADD config /config
 ADD supervisord.conf /etc/supervisor/conf.d/postgresql.conf
 EXPOSE 5432

services/sniproxy/Dockerfile

@@ -8,7 +8,7 @@ RUN wget "http://archive.ubuntu.com/ubuntu/pool/universe/u/udns/udns_${UDNS_VERS
 RUN tar fxz udns_*.orig.tar.gz; cd udns-*; tar fxz ../udns_*-1.debian.tar.gz; dpkg-buildpackage; cd ..; dpkg -i libudns-dev_*.deb libudns0_*.deb
 RUN tar fxz ${SNIPROXY_VERSION}.tar.gz; cd sniproxy-*; dpkg-buildpackage; dpkg -i ../sniproxy_*.deb
 RUN rm -rf *
-ADD init /config/init/03sniproxy
+ADD config /config
 ADD supervisord.conf /etc/supervisor/conf.d/sniproxy.conf
 EXPOSE 80
 EXPOSE 443

services/sniproxy/config/init03

@@ -0,0 +1,2 @@
+mkdir -p /data/sniproxy /data/iptables
+touch /data/sniproxy/sniproxy.conf /data/iptables/iptables

services/sniproxy/supervisord.conf

@@ -5,7 +5,7 @@ command=sniproxy -c /data/sniproxy/sniproxy.conf -f
 command=bash -c "while inotifywait -e create,modify,move -q /data/sniproxy/; do supervisorctl restart sniproxy; done"
 
 [program:iptables]
-command=bash -c "iptables-restore < /data/iptables/iptables.rules"
+command=bash -c "iptables-restore < /data/iptables/iptables"
 
 [program:iptables-config]
 command=bash -c "while inotifywait -e create,modify,move -q /data/iptables/; do supervisorctl restart iptables; done"

services/subsonic/Dockerfile

@@ -1,8 +1,8 @@
 FROM maxexcloo/java:latest
 MAINTAINER Max Schaefer <max@excloo.com>
 ENV MEMORY 256
-ENV VERSION 4.9
+ENV VERSION 5.0
 apt-get install -y ffmpeg lame
-ADD init /config/init/03subsonic
+ADD config /config
 ADD supervisord.conf /etc/supervisor/conf.d/subsonic.conf
 EXPOSE 4040