add make
Merge branch 'ubuntu-general'
Merge branch 'jenkins' of github.com:kcyeu/docker into jenkins