[WIP] Add base image from the build UpstreamImage if set

A rough in progress change.
yes, but also do the ENV var adding logic, that way we don't have to double-build.