move the magic into the ENTRYPOINT script
Merge branch 'master' of github.com:SvenDowideit/dockerfiles