Adds packet-headers to the measurementlab/ndt image (#214)

fullstack/Dockerfile

@@ -11,12 +11,17 @@ COPY --from=measurementlab/tcp-info /bin/tcp-info /tcp-info
 COPY --from=measurementlab/tcp-info /bin/zstd /bin/zstd
 COPY --from=measurementlab/tcp-info /licences/zstd/ /licences/zstd/
 
+# packet-headers needs its binary and libpcap.  There's no good way to get both
+# easily from the image, due to C-linking issues and the differences between
+# alpine and ubuntu, so just rebuild it here.
+RUN apt-get update && apt-get install -y libpcap-dev golang-go git
+RUN go get github.com/m-lab/packet-headers
+RUN mv /root/go/bin/packet-headers /packet-headers
+
 # The NDT server needs the server binary and its HTML files
 COPY --from=measurementlab/ndt-server /ndt-server /
 COPY --from=measurementlab/ndt-server /html /html
 
-# TODO: Still need packet-headers
-
 COPY fullstack/start.sh /start.sh
 RUN chmod +x /start.sh
 

fullstack/start.sh

@@ -59,7 +59,14 @@ mkdir -p "${DATA_DIR}"/traceroute
   --tcpinfo.socket=/var/local/tcpeventsocket.sock \
   &
 
-# TODO: Start the packet header capture service.
+# Start packet header capture.
+mkdir -p "${DATA_DIR}"/pcap
+/packet-headers \
+  --prometheusx.listen-address=:9993 \
+  --datadir="${DATA_DIR}"/pcap \
+  --eventsocket=/var/local/tcpeventsocket.sock \
+  &
+
 
 # Start the NDT server.
 /ndt-server \