Converted tftpd

tftpd/Dockerfile

@@ -1,28 +1,13 @@
-FROM robinthoni/debian-multiarch:jessie
+FROM debian:stretch
 
-MAINTAINER Robin Thoni <robin@rthoni.com>
+ADD https://raw.githubusercontent.com/robin-thoni/docker-utils/v1.3.0/setup.sh /tmp/docker-utils-setup.sh
+RUN sh /tmp/docker-utils-setup.sh
+ENTRYPOINT ["gcf-entrypoint"]
 
-ARG CONFIG_DIR=/etc/default/config-files/
-
-RUN apt-get update && apt-get -y install\
+RUN pkgs-install\
         tftpd-hpa\
-        xinetd &&\
-        apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN rm -rf /var/log/*
-
-COPY ./vars-vars /etc/vars-vars
-
-COPY ./vars-files /etc/vars-files
-
-COPY ./common.sh /common.sh
-
-COPY ./run.sh /run.sh
-
-RUN mkdir "${CONFIG_DIR}"
-
-COPY xinetd.tftp.conf "${CONFIG_DIR}"/tftp
+        xinetd
 
-EXPOSE 80
+COPY ./config /etc/salt/base/
 
-CMD ["/run.sh"]
+CMD ["xinetd", "-dontfork"]

tftpd/common.sh

@@ -1,41 +0,0 @@
-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
-}

tftpd/config/states/tftpd/init.sls

@@ -0,0 +1,4 @@
+tftpd-config:
+  file.managed:
+    - name: /etc/xinetd.d/tftp
+    - source: salt://tftpd/xinetd.tftp.conf

tftpd/run.sh

@@ -1,7 +0,0 @@
-#! /usr/bin/env bash
-
-. /common.sh
-
-replace_files
-
-exec xinetd -dontfork

tftpd/vars-files

@@ -1 +0,0 @@
-tftp /etc/xinetd.d/tftp

tftpd/vars-vars

@@ -1,22 +0,0 @@
-DHCP_DNS_MASTER
-DHCP_DNS_SERVERS
-DHCP_TFTP_SERVER
-DHCP_ROUTERS
-DHCP_UNIFI_CONTROLLER_IP
-
-DHCP_DOMAIN
-DHCP_SITE_DOMAIN
-DHCP_DYN_IPS_DOMAIN
-DHCP_REV_DOMAIN
-
-DHCP_SUBNET
-DHCP_NETMASK
-DHCP_IP_FIRST
-DHCP_IP_LAST
-DHCP_BROADCAST
-
-DNS_FORWARDER_IP_1
-DNS_FORWARDER_IP_2
-DNS_TSIG_KEY_INTERNAL_SECRET
-DNS_TSIG_KEY_EXTERNAL_SECRET
-DNS_TSIG_KEY_RNDC_SECRET