My docker changes:
  - remove modification to apt sources
  - use aptitude for dependency resolution
  - work on HEAD