dockerfile tweak and bump base to master