Add docker and improve usability of tap