cmd/create, cmd/run: Warning message when using non-Toolbx image

Display compatibility warnings for images that don't meet Toolbx
requirements. Only prompt for confirmation when assumeyes is not
set. Update both create and run commands to use unified
DoesImageFulfillRequirements() function inctroduced in commit
e7bef55.

Signed-off-by: Dalibor Kricka <[email protected]>

Author: DaliborKr

src/cmd/create.go

@@ -241,14 +241,15 @@ func createContainer(container, image, release, authFile string, showCommandToEn
 		}
 	}
 
-	if !rootFlags.assumeYes {
-		if isToolboxImage, err := podman.IsToolboxImage(imageFull); err != nil {
-			return fmt.Errorf("failed to verify image compatibility: %w", err)
-		} else if !isToolboxImage {
-			prompt := fmt.Sprintf("Image '%s' is not a Toolbx image and may not work properly (see https://containertoolbx.org/doc/). Continue anyway? [y/N]:", imageFull)
-			if !askForConfirmation(prompt) {
-				return nil
-			}
+	isImageCompatible, warningMessage, err := podman.DoesImageFulfillRequirements(imageFull)
+	if err != nil {
+		return fmt.Errorf("%w", err)
+	}
+
+	if !isImageCompatible {
+		fmt.Fprintf(os.Stderr, "%s\n", warningMessage)
+		if !rootFlags.assumeYes && !askForConfirmation("One or more of the image's requirements are not met. Continue anyway? [y/N]:") {
+			return nil
 		}
 	}
 

src/cmd/run.go

@@ -255,16 +255,15 @@ func runCommand(container string,
 		return fmt.Errorf("failed to inspect container %s", container)
 	}
 
-	if checkImageCompatibility && !rootFlags.assumeYes {
-		imageFull := containerObj.Image()
-
-		if isToolboxImage, err := podman.IsToolboxImage(imageFull); err != nil {
-			logrus.Debugf("Failed to verify image '%s' compatibility for container '%s': %s", imageFull, container, err)
-		} else if !isToolboxImage {
-			prompt := fmt.Sprintf("Container '%s' uses a non-Toolbx image '%s' and may not work properly (see https://containertoolbx.org/doc/). Continue anyway? [y/N]:", container, imageFull)
-			if !askForConfirmation(prompt) {
-				return nil
-			}
+	isImageCompatible, warningMessage, err := podman.DoesImageFulfillRequirements(containerObj.Image())
+	if err != nil {
+		return fmt.Errorf("%w", err)
+	}
+
+	if !isImageCompatible && checkImageCompatibility {
+		fmt.Fprintf(os.Stderr, "%s\n", warningMessage)
+		if !rootFlags.assumeYes && !askForConfirmation("One or more of the image's requirements are not met. Continue anyway? [y/N]:") {
+			return nil
 		}
 	}