Merge "Switch from fig to docker-compose"