epiph/fix-docker-and-docker-compose

master