Support tagging images during build

Upstream PR is #457

Full details there and the associated issue.