Build docker straight from ubuntu. move a few things