fix(initrd): Change detection priority

Dockerfile > File > Directory > OCI Image These are ordered by lightweightness and similarly to prevent fallbacks; e.g. a Dockerfile is technically a file so ordering a check for a file before a dockerfile first would result in the Dockerfile being used verbatim (as opposed to being built). Signed-off-by: Alexander Jung <[email protected]>
unikraft · Nov 19, 2024 · f36a514 · f36a514
1 parent 442234b
commit f36a514
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/initrd/detect.go b/initrd/detect.go
@@ -12,11 +12,11 @@ import (
 // New attempts to return the builder for a supplied path which
 // will allow the provided ...
 func New(ctx context.Context, path string, opts ...InitrdOption) (Initrd, error) {
-	if builder, err := NewFromFile(ctx, path, opts...); err == nil {
+	if builder, err := NewFromDockerfile(ctx, path, opts...); err == nil {
 		return builder, nil
-	} else if builder, err := NewFromDirectory(ctx, path, opts...); err == nil {
+	} else if builder, err := NewFromFile(ctx, path, opts...); err == nil {
 		return builder, nil
-	} else if builder, err := NewFromDockerfile(ctx, path, opts...); err == nil {
+	} else if builder, err := NewFromDirectory(ctx, path, opts...); err == nil {
 		return builder, nil
 	} else if builder, err := NewFromOCIImage(ctx, path, opts...); err == nil {
 		return builder, nil