Merge pull request #2409 from jalessio/docker-compose-take2