Split up by docker and non docker
Merge pull request #1 from lyddonb/add_non_docker

Split up by docker and non docker