remove phpunit since it exists in base image
add make
Merge branch 'ubuntu-general'