MIXING $$$$$$$$$$$$$$$$$

try to combin 2 Dockerfiles to 1