Changes for Docker Compose support

Just creating this as a placeholder for switching to Docker Compose once it becomes mainstream (in order to avoid the need to install python and fig).