Vendor c/image after https://github.com/containers/image/pull/1816

Also includes unreleased https://github.com/openshift/imagebuilder/pull/246 to work
with the updated docker/docker dependency.

And updates some references to newly deprecated docker/docker symbols.

[NO NEW TESTS NEEDED]

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

vendor/github.com/containers/image/v5/docker/reference/regexp.go

@@ -1,9 +1,10 @@
 package reference
 
 import (
-	storageRegexp "github.com/containers/storage/pkg/regexp"
 	"regexp"
 	"strings"
+
+	storageRegexp "github.com/containers/storage/pkg/regexp"
 )
 
 const (