first working version

.gitignore

@@ -1,2 +1,4 @@
-/data
+/data/isc-dhcp
+initrd.img
+vmlinuz
 *.swp

apache/Dockerfile

@@ -0,0 +1,39 @@
+FROM debian:jessie
+
+# FROM https://github.com/ZHAJOR/Docker-Apache-2.4-Php-5.6-for-Laravel
+MAINTAINER Robin Thoni <robin@rthoni.com>
+
+RUN apt-get update && apt-get -y install\
+        apache2=2.4.*\
+        libapache2-mod-php5\
+        php5\
+        php5-mcrypt\
+        php5-pgsql\
+        php5-mysql\
+        php5-gd\
+        php5-curl\
+        php5-imap &&\
+        apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN /usr/sbin/a2enmod rewrite &&\
+    rm -rf /var/www/html &&\
+    mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html &&\
+    chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
+
+RUN rm -rf /var/log/* &&\
+    mkdir -p /var/log/apache2 &&\
+    ln -s /dev/stderr /var/log/apache2/error.log &&\
+    ln -s /dev/stdout /var/log/apache2/access.log &&\
+    ln -s /dev/stdout /var/log/apache2/other_vhosts_access.log
+
+COPY apache2.conf /etc/apache2/apache2.conf
+
+COPY ./vars-vars /etc/vars-vars
+
+COPY ./vars-files /etc/vars-files
+
+COPY ./run.sh /run.sh
+
+EXPOSE 80
+
+CMD ["/run.sh"]

apache/apache2.conf

@@ -0,0 +1,59 @@
+# see http://sources.debian.net/src/apache2/2.4.10-1/debian/config-dir/apache2.conf
+
+Mutex file:/var/lock/apache2 default
+PidFile /var/run/apache2/apache2.pid
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 5
+User www-data
+Group www-data
+HostnameLookups Off
+ErrorLog /var/log/apache2/error.log
+LogLevel warn
+
+IncludeOptional mods-enabled/*.load
+IncludeOptional mods-enabled/*.conf
+
+# ports.conf
+Listen 80
+<IfModule ssl_module>
+    Listen 443
+</IfModule>
+<IfModule mod_gnutls.c>
+    Listen 443
+</IfModule>
+
+DocumentRoot "/var/www/"
+
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Require all denied
+</Directory>
+
+<Directory /var/www/>
+    Options FollowSymLinks
+    AllowOverride All
+    Require all granted
+</Directory>
+
+
+
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+CustomLog /var/log/apache2/access.log combined
+
+<FilesMatch \.php$>
+    SetHandler application/x-httpd-php
+</FilesMatch>
+
+# Multiple DirectoryIndex directives within the same context will add
+# to the list of resources to look for rather than replace
+# https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
+DirectoryIndex disabled
+DirectoryIndex index.php index.html

apache/common.sh

@@ -0,0 +1,41 @@
+export CONFIG_DIR="/etc/default/config-files/"
+
+resolv_host()
+{
+  hostname="${1}"
+  ip=$(getent hosts "${hostname}" | cut -d' ' -f1)
+  echo "${ip}"
+}
+
+replace_var()
+{
+  file="${1}"
+  var="${2}"
+  sed -e "s?${var}?${!var}?g" -i "${file}"
+}
+
+replace_vars()
+{
+  file="${1}"
+  for var in $(cat /etc/vars-vars)
+  do
+    replace_var "${file}" "${var}"
+  done
+}
+
+replace_files()
+{
+  cat /etc/vars-files | while read line
+  do
+    filesrc="${CONFIG_DIR}$(echo "${line}" | awk '{print $1}')"
+    filedst=$(echo "${line}" | awk '{print $2}')
+    if [ -f "${filesrc}" ]
+    then
+      echo "Expanding file ${filesrc} to ${filedst}"
+      cp "${filesrc}" "${filedst}"
+      replace_vars "${filedst}"
+    else
+      echo "File ${filesrc} does not exist. Skipping."
+    fi
+  done
+}

apache/run.sh

@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+
+. /common.sh
+
+replace_files
+
+rm -f /run/apache2/apache2.pid
+exec /usr/sbin/apache2ctl -D FOREGROUND

apache/vars-vars

@@ -0,0 +1,2 @@
+DNS_HOST_ROUTER
+IP_HOST8ROUTER

data/apache/files/.htaccess

@@ -0,0 +1 @@
+AddType application/x-httpd-php .ipxe

data/apache/files/boot.ipxe

@@ -0,0 +1,79 @@
+<?php
+
+$common = ':shell
+shell
+
+:reboot
+reboot
+
+:boot-install
+set unix install/${install}
+set options vga=788 -- quiet
+goto boot-unix
+
+:boot-live
+set unix live/${live}
+set options vga=normal ramdisk_size=14332 root=/dev/nfs nfsroot=10.15.44.1:/pxeroot/${live} rw --
+goto boot-unix
+
+:boot-unix
+initrd unix/${unix}/initrd.img
+boot unix/${unix}/vmlinuz ${options}
+
+
+:boot-iso
+initrd iso/${iso}
+chain /memdisk iso raw
+boot
+
+:boot-winpe
+kernel winpe/${winpe}/wimboot
+initrd winpe/${winpe}/bcd                 BCD
+initrd winpe/${winpe}/boot.sdi            boot.sdi
+initrd winpe/${winpe}/boot.wim            boot.wim
+boot';
+
+echo "#!ipxe\n";
+echo "console --picture misc/splash.png\n";
+echo "menu gigi PXE\n\n";
+
+
+$types = [['live', 'unix/live', 'Live'],
+  ['iso', 'iso', 'ISO'],
+  ['install', 'unix/install', 'Installers'],
+  ['winpe', 'winpe', 'Windows PE']];
+
+$labels = "";
+
+foreach ($types as $type)
+{
+  echo "\nitem --gap -- " . $type[2] . "\n";
+  if (is_dir($type[1])) {
+    $items = scandir($type[1]);
+    if (is_null($items))
+      continue;
+    foreach ($items as $item)
+    {
+      if ($item[0] == '.')
+        continue;
+      $name = ucwords($item);
+      $label = $item . '-' . $type[0];
+      echo "item $label" . " $name\n";
+      $labels .= "\n\n:" . $label . "\n";
+      $labels .= 'set ' . $type[0] . ' ' . $item . "\n";
+      $labels .= 'goto boot-' . $type[0] . "\n\n";
+    }
+  }
+}
+
+echo "item --gap -- Misc
+item shell Shell
+item reboot Reboot\n";
+echo 'choose choice && goto ${choice}' . "\n";
+
+echo $labels;
+
+echo $common;
+
+?>
+

docker-compose.override.yml

@@ -0,0 +1,7 @@
+version: '2'
+
+services:
+    apache:
+        ports:
+            - "10.15.100.1:80:80"
+

docker-compose.yml

@@ -7,12 +7,6 @@ services:
         volumes:
             - ./data/isc-dhcp:/data
         network_mode: host
-#        networks:
-#            dhcp.internal.docker:
-#                aliases:
-#                    - isc-dhcp.dhcp.internal.docker
-#        ports:
-#            - "0.0.0.0:67:67/udp"
         env_file:
             - env
 
@@ -21,25 +15,17 @@ services:
         container_name: dhcp-tftpd
         volumes:
             - ./data/tftpd/tftp:/srv/tftp/
-        networks:
-            dhcp.internal.docker:
-                aliases:
-                    - tftpd.dhcp.internal.docker
-        ports:
-            - "0.0.0.0:69:69/udp"
+        network_mode: host
         env_file:
             - env
 
-#    dhcp-recursor:
-#        build: ./dhcp-recursor
-#        container_name: dhcp-dhcp-recursor
-#        networks:
-#            dhcp.internal.docker:
-#                aliases:
-#                    - dhcp-recursor.dhcp.internal.docker
-#        env_file:
-#            - env
-
+    apache:
+        build: ./apache
+        container_name: dhcp-apache
+        volumes:
+            - ./data/apache/files:/var/www
+        ports:
+            - "127.0.0.1:34030:80"
+        env_file:
+            - env
 
-networks:
-    dhcp.internal.docker:

isc-dhcp/dhcpd.conf

@@ -17,22 +17,22 @@ subnet 10.15.100.0 netmask 255.255.255.0 {
   range 10.15.100.50 10.15.100.250;
   option subnet-mask 255.255.255.0;
   option broadcast-address 10.15.100.255;
-  option routers 10.15.100.2;
+  option routers 10.15.100.1;
 
-  option domain-name "site.rthoni.com rthoni.com";
+  option domain-name "site.rthoni.com";
   option domain-name-servers 10.15.100.1;
 
   #option classless-routes 24, 10,15,42, 10.15.12,2;
   #option classless-routes-win 24, 10,15,42, 10.15.12,2;
 
-  next-server 10.15.100.2;
+  next-server 10.15.100.1;
   if exists user-class and ( option user-class = "iPXE-rthoni" ) {
     filename "http://netboot/boot.ipxe";
   }
   else {
     filename "ipxe-rthoni.kpxe";
   }
-  option root-path "10.15.100.1:/pxeroot/ubuntu";
+#  option root-path "10.15.100.1:/pxeroot/ubuntu";
 
 }
 

tftpd/xinetd.tftp.conf

@@ -5,5 +5,5 @@ service tftp
     wait                = yes
     user                = root
     server              = /usr/sbin/in.tftpd
-    server_args = /srv/tftp/
+    server_args = -s /srv/tftp/
   }

update_vars.sh

@@ -1,7 +1,7 @@
 #! /usr/bin/env sh
 
 vars=$(cat env | cut -d= -f1)
-for docker in isc-dhcp tftpd
+for docker in isc-dhcp tftpd apache
 do
   echo "${vars}" > "./${docker}/vars-vars"
 done