container from/build merging

[tough breach]

I gave an approval, but quick sanity check: does anything need to be done for exposed ports? I see it mentioned in a comment, and the test covers it, but I guess no code change was needed?

[olive canyon]

Oh you're right, I need to add another function to handle that because the type is different than map[string]string