removed unused env variables; fixed config files copy/expansion

apache/Dockerfile

@@ -3,6 +3,8 @@ FROM debian:jessie
 # FROM https://github.com/ZHAJOR/Docker-Apache-2.4-Php-5.6-for-Laravel
 MAINTAINER Robin Thoni <robin@rthoni.com>
 
+ARG CONFIG_DIR=/etc/default/config-files/
+
 RUN apt-get update && apt-get -y install\
         apache2=2.4.*\
         libapache2-mod-php5\
@@ -26,8 +28,6 @@ RUN rm -rf /var/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
@@ -36,6 +36,10 @@ COPY ./common.sh /common.sh
 
 COPY ./run.sh /run.sh
 
+RUN mkdir "${CONFIG_DIR}"
+
+COPY apache2.conf "${CONFIG_DIR}"/apache2.conf
+
 EXPOSE 80
 
 CMD ["/run.sh"]

apache/vars-files

@@ -0,0 +1 @@
+apache2.conf /etc/apache2/apache2.conf

apache/vars-vars

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

env

@@ -1,2 +1 @@
-DNS_HOST_ROUTER=router
-IP_HOST8ROUTER=
+

isc-dhcp/vars-vars

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

tftpd/dhcpd.conf

@@ -1,38 +0,0 @@
-ddns-update-style none;
-
-option classless-routes code 121 = array of unsigned integer 8;
-option classless-routes-win code 249 = array of unsigned integer 8;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-use-host-decl-names on;
-
-authoritative;
-
-log-facility local7;
-
-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 domain-name "site.rthoni.com 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;
-  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";
-
-}
-

tftpd/vars-vars

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