add docker
Merge branch 'master' of github.com:matthieucan/misc-scripts

Conflicts:
	post-install.sh