update docker file
Merge branch 'master' of https://github.com/folieadrien/kargo

Conflicts:
	Dockerfile