Merge pull request #945 from comick/betterlog

storage: improve error message on image mount from r/o store

Author: mtrmac

storage/store.go

@@ -3066,7 +3066,17 @@ func (s *store) MountImage(id string, mountOpts []string, mountLabel string) (st
 		MountLabel: mountLabel,
 		Options:    append(mountOpts, "ro"),
 	}
-	return rlstore.Mount(ilayer.ID, options)
+	if rlstore.Exists(ilayer.ID) {
+		return rlstore.Mount(ilayer.ID, options)
+	}
+	// check if the layer is in a read-only store, and return a better error message
+	for _, store := range lstores {
+		// required read lock is acquired earlier in this function
+		if store.Exists(ilayer.ID) {
+			return "", fmt.Errorf("mounting read/only store images is not allowed: %w", ErrStoreIsReadOnly)
+		}
+	}
+	return "", ErrLayerUnknown
 }
 
 func (s *store) Mount(id, mountLabel string) (string, error) {