Merge pull request #55 from dezeroku/to-upstream

Replace in.tftp server with dnsmasq, to add support for single-port TFTP

Dockerfile

@@ -25,7 +25,7 @@ RUN \
    supervisor \
    syslog-ng \
    tar \
-   tftp-hpa && \
+   dnsmasq && \
  apk add --no-cache --virtual=build-dependencies \
    npm && \
  groupmod -g 1000 users && \

README.md

@@ -116,6 +116,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e WEB_APP_PORT=3000` | Specify a different port for the web configuration interface to listen on. |
 | `-e NGINX_PORT=80` | Specify a different port for NGINX service to listen on. |
 | `-e MENU_VERSION=2.0.76` | Specify a specific version of boot files you want to use from netboot.xyz (unset pulls latest) |
+| `-e TFTPD_OPTS='--tftp-single-port'` | Specify arguments for the TFTP server (this example makes TFTP send all data over port 69) |
 | `-v /config` | Storage for boot menu files and web application config |
 | `-v /assets` | Storage for netboot.xyz bootable assets (live CDs and other files) |
 

root/etc/supervisor.conf

@@ -21,8 +21,8 @@ user=nbxyz
 directory=/app
 priority = 3
 
-[program:in.tftpd]
-command=/usr/sbin/in.tftpd -Lvvv --user nbxyz --secure %(ENV_TFTPD_OPTS)s /config/menus
+[program:dnsmasq]
+command=/usr/sbin/dnsmasq --port=0 --keep-in-foreground --enable-tftp --user=nbxyz --tftp-secure --tftp-root=/config/menus %(ENV_TFTPD_OPTS)s
 stdout_logfile=/config/tftpd.log
 redirect_stderr=true
 priority = 4