docker-io vanilla mostly fixed

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>