Move dockerfile into base
Update base