Dockerfile rebased to dockerfile/ubuntu