using 'DHCPD_PROTOCOL' as variable

Author: ticevi

Dockerfile

@@ -12,5 +12,7 @@ RUN apt-get -q -y update \
  && apt-get -q -y clean \
  && rm -rf /var/lib/apt/lists/*
 
+ENV DHCPD_PROTOCOL=4
+
 COPY util/entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

Dockerfile.ldap

@@ -12,5 +12,7 @@ RUN apt-get -q -y update \
  && apt-get -q -y clean \
  && rm -rf /var/lib/apt/lists/*
 
+ENV DHCPD_PROTOCOL=4
+
 COPY util/entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -39,7 +39,7 @@ DHCPv6
 
 To use a DHCPv6-Server you have to pass `DHCPv6` as enviroment variable
 
-`docker run -it --rm --init -e DHCPv6 --net host -v "$(pwd)/data":/data networkboot/dhcpd eth0`
+`docker run -it --rm --init -e DHCPD_PROTOCOL=6 --net host -v "$(pwd)/data":/data networkboot/dhcpd eth0`
 
 
 Notes

util/entrypoint.sh

@@ -69,12 +69,7 @@ if [ -n "$IFACE" ]; then
         echo "You must add the 'docker run' option '--net=host' if you want to provide DHCP service to the host network."
     fi
 
-    # check if v6 should be used	
-    if [ -n "$DHCPv6"]; then
-	$run /usr/sbin/dhcpd -6 -f -d --no-pid -cf "$data_dir/dhcpd.conf" -lf "$data_dir/dhcpd.leases" $IFACE
-    else
-        $run /usr/sbin/dhcpd -4 -f -d --no-pid -cf "$data_dir/dhcpd.conf" -lf "$data_dir/dhcpd.leases" $IFACE
-    fi	
+    $run /usr/sbin/dhcpd -$DHCPD_PROTOCOL -f -d --no-pid -cf "$data_dir/dhcpd.conf" -lf "$data_dir/dhcpd.leases" $IFACE
 else
     # Run another binary
     $run "$@"