Cleanup current setup and get it updated to Docker 17.06 so we can gradually start to take advantage of it's features (multistage build, :cached, healthcheck ...).