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

A rough in progress change.
if you return here you won't add the env variables which needs to always be done even if there's no upstream image.