Redo some stuff in the base dockerfile
Make berkshelf work with old solve that doesn't fail with gecode selector