libimage: load: try docker-archive first

Make sure to try loading the docker-archive first to account for the "hybrid tarballs" created by buildkit. docker-archive gets the name right while oci-archive will not. Fixes: github.com/containers/podman/pull/11619 Signed-off-by: Valentin Rothberg <[email protected]>
Luap99 · Sep 30, 2021 · 624ff20 · 624ff20
1 parent 2eff585
commit 624ff20
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/libimage/load.go b/libimage/load.go
@@ -35,6 +35,17 @@ func (r *Runtime) Load(ctx context.Context, path string, options *LoadOptions) (
 	var loadErrors []error
 
 	for _, f := range []func() ([]string, string, error){
+		// DOCKER-ARCHIVE - must be first (see containers/podman/issues/10809)
+		func() ([]string, string, error) {
+			logrus.Debugf("-> Attempting to load %q as a Docker archive", path)
+			ref, err := dockerArchiveTransport.ParseReference(path)
+			if err != nil {
+				return nil, dockerArchiveTransport.Transport.Name(), err
+			}
+			images, err := r.loadMultiImageDockerArchive(ctx, ref, &options.CopyOptions)
+			return images, dockerArchiveTransport.Transport.Name(), err
+		},
+
 		// OCI
 		func() ([]string, string, error) {
 			logrus.Debugf("-> Attempting to load %q as an OCI directory", path)
@@ -67,17 +78,6 @@ func (r *Runtime) Load(ctx context.Context, path string, options *LoadOptions) (
 			images, err := r.copyFromDefault(ctx, ref, &options.CopyOptions)
 			return images, dirTransport.Transport.Name(), err
 		},
-
-		// DOCKER-ARCHIVE
-		func() ([]string, string, error) {
-			logrus.Debugf("-> Attempting to load %q as a Docker archive", path)
-			ref, err := dockerArchiveTransport.ParseReference(path)
-			if err != nil {
-				return nil, dockerArchiveTransport.Transport.Name(), err
-			}
-			images, err := r.loadMultiImageDockerArchive(ctx, ref, &options.CopyOptions)
-			return images, dockerArchiveTransport.Transport.Name(), err
-		},
 	} {
 		loadedImages, transportName, err := f()
 		if err == nil {