[CI:BUILD] WIP Cleanup Image Dockerfiles
[CI:BUILD] WIP Cleanup Image Dockerfiles

Cleans up the Dockerfiles for the buildah images that land on quay.

A number of readability changes, and an adjustment to sed to
handle storage.conf.

Signed-off-by: tomsweeneyredhat <0d9c75ecdfb440d0db7595b9f1ea08841c99bb0e@redhat.com>

TomSweeneyRedHat/buildah,nalind/buildah-1,nalind/buildah-1,TomSweeneyRedHat/buildah,nalind/buildah-1,TomSweeneyRedHat/buildah