Try a different multi-stage Dockerfile approach

The current Dockerfile fails to produce a valid image, there's an odd
bug where we are pushing what looks like an intermediate to the registry.