Remove imagebuildermacros

Cherry picked @gabrielericciardi 's commit and cleaned up the docker file a bit