differnt docker builds for different branches

[Waog]

currently the Dockerfile is different on every branch to ensure different builds. This requires manual labor after merging.

Unify the Dockerfile to work correctly!