modify mount and umount

sealerio · Mar 7, 2023 · a4cfea4 · a4cfea4
1 parent 59035bf
commit a4cfea4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 64 deletions.
diff --git a/cmd/sealer/cmd/alpha/mount.go b/cmd/sealer/cmd/alpha/mount.go
@@ -100,13 +100,13 @@ func NewMountService() (MountService, error) {
 		return MountService{}, err
 	}
 
-	builders, err := imagebuildah.OpenBuilders(store)
+	builders, err := buildah.OpenAllBuilders(store)
 	if err != nil {
 		return MountService{}, err
 	}
 
 	table := tablewriter.NewWriter(common.StdOut)
-	table.SetHeader([]string{imageName, tableHeaderContainerID, tableHeaderMountPath})
+	table.SetHeader([]string{tableHeaderContainerID, tableHeaderMountPath})
 
 	return MountService{
 		table:      table,
@@ -118,19 +118,8 @@ func NewMountService() (MountService, error) {
 	}, nil
 }
 
-func (m MountService) getMountedImageName(container storage.Container) string {
-	for _, image := range m.images {
-		for _, name := range image.Names {
-			if container.ImageID == image.ID {
-				return name
-			}
-		}
-	}
-	return ""
-}
-
 func (m MountService) Show() error {
-	clients, err := imagebuildah.OpenBuilders(m.store)
+	clients, err := buildah.OpenAllBuilders(m.store)
 	if err != nil {
 		return fmt.Errorf("reading build Containers: %w", err)
 	}
@@ -141,9 +130,8 @@ func (m MountService) Show() error {
 		}
 		for _, container := range m.containers {
 			if client.ContainerID == container.ID && mounted {
-				name := m.getMountedImageName(container)
 				containerID := imagebuildah.TruncateID(client.ContainerID, true)
-				m.table.Append([]string{name, containerID, client.MountPoint})
+				m.table.Append([]string{containerID, client.MountPoint})
 			}
 		}
 	}

diff --git a/cmd/sealer/cmd/alpha/umount.go b/cmd/sealer/cmd/alpha/umount.go
@@ -18,10 +18,11 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/containers/buildah"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/sealerio/sealer/pkg/imageengine/buildah"
+	imagebuildah "github.com/sealerio/sealer/pkg/imageengine/buildah"
 )
 
 var (
@@ -31,7 +32,6 @@ var (
 umount the cluster image and delete the mount directory
 `
 	exampleForUmountCmd = `
-  sealer alpha umount my-image
   sealer alpha umount containerID
   sealer alpha umount --all
 `
@@ -72,38 +72,21 @@ func NewUmountCmd() *cobra.Command {
 	return umountCmd
 }
 
-func (m MountService) Umount(imageNameOrID string) error {
-	var containerID string
-	if ok := m.IsContainImgName(imageNameOrID); !ok {
-		containerID = imageNameOrID
-	} else {
-		containerID = m.getContainerID(imageNameOrID)
-	}
-
-	client, err := buildah.OpenBuilder(context.TODO(), m.store, containerID)
+func (m MountService) Umount(containerID string) error {
+	client, err := imagebuildah.OpenBuilder(context.TODO(), m.store, containerID)
 	if err != nil {
-		return fmt.Errorf("failed to unmount image %s: %w", imageNameOrID, err)
+		return fmt.Errorf("failed to reading build container %s: %w", containerID, err)
 	}
 
 	if err := client.Unmount(); err != nil {
 		return fmt.Errorf("failed to unmount container %q: %w", client.Container, err)
 	}
-	logrus.Infof("umount %s successful", imageNameOrID)
+	logrus.Infof("umount %s successful", containerID)
 	return nil
 }
 
-func (m MountService) getContainerID(imageName string) string {
-	imageID := m.getImageID(imageName)
-	for _, container := range m.containers {
-		if container.ImageID == imageID {
-			return container.ID
-		}
-	}
-	return ""
-}
-
 func (m MountService) UmountAllContainers() error {
-	clients, err := buildah.OpenBuilders(m.store)
+	clients, err := buildah.OpenAllBuilders(m.store)
 	if err != nil {
 		return fmt.Errorf("reading build Containers: %w", err)
 	}
@@ -118,14 +101,3 @@ func (m MountService) UmountAllContainers() error {
 	}
 	return nil
 }
-
-func (m MountService) IsContainImgName(imageName string) bool {
-	for _, image := range m.images {
-		for _, name := range image.Names {
-			if name == imageName {
-				return true
-			}
-		}
-	}
-	return false
-}
diff --git a/pkg/imageengine/buildah/commit.go b/pkg/imageengine/buildah/commit.go
@@ -56,7 +56,7 @@ func (engine *Engine) Commit(opts *options.CommitOptions) (string, error) {
 
 	ctx := getContext()
 	store := engine.ImageStore()
-	builder, err := openBuilder(ctx, store, name)
+	builder, err := OpenBuilder(ctx, store, name)
 	if err != nil {
 		return "", errors.Wrapf(err, "error reading build container %q", name)
 	}

diff --git a/pkg/imageengine/buildah/common.go b/pkg/imageengine/buildah/common.go
@@ -80,10 +80,6 @@ func getStore(configurations *options.EngineGlobalConfigurations) (storage.Store
 }
 
 func OpenBuilder(ctx context.Context, store storage.Store, name string) (builder *buildah.Builder, err error) {
-	return openBuilder(ctx, store, name)
-}
-
-func openBuilder(ctx context.Context, store storage.Store, name string) (builder *buildah.Builder, err error) {
 	if name != "" {
 		builder, err = buildah.OpenBuilder(store, name)
 		if os.IsNotExist(errors.Cause(err)) {
@@ -102,10 +98,6 @@ func openBuilder(ctx context.Context, store storage.Store, name string) (builder
 	return builder, nil
 }
 
-func OpenBuilders(store storage.Store) (builders []*buildah.Builder, err error) {
-	return buildah.OpenAllBuilders(store)
-}
-
 func openImage(ctx context.Context, sc *types.SystemContext, store storage.Store, name string) (builder *buildah.Builder, err error) {
 	options := buildah.ImportFromImageOptions{
 		Image:         name,

diff --git a/pkg/imageengine/buildah/config.go b/pkg/imageengine/buildah/config.go
@@ -31,7 +31,7 @@ func (engine *Engine) Config(opts *options.ConfigOptions) error {
 
 	ctx := getContext()
 	store := engine.ImageStore()
-	builder, err := openBuilder(ctx, store, name)
+	builder, err := OpenBuilder(ctx, store, name)
 	if err != nil {
 		return errors.Wrapf(err, "error reading build container %q", name)
 	}

diff --git a/pkg/imageengine/buildah/copy.go b/pkg/imageengine/buildah/copy.go
@@ -53,7 +53,7 @@ func (engine *Engine) Copy(opts *options.CopyOptions) error {
 		return errors.Errorf("--ignorefile option requires that you specify a context dir using --contextdir")
 	}
 
-	builder, err := openBuilder(getContext(), store, name)
+	builder, err := OpenBuilder(getContext(), store, name)
 	if err != nil {
 		return errors.Wrapf(err, "error reading build container %q", name)
 	}

diff --git a/pkg/imageengine/buildah/mount.go b/pkg/imageengine/buildah/mount.go
@@ -42,7 +42,7 @@ func (engine *Engine) Mount(opts *options.MountOptions) ([]options.JSONMount, er
 	}
 
 	for _, name := range containers {
-		builder, err := openBuilder(getContext(), store, name)
+		builder, err := OpenBuilder(getContext(), store, name)
 		if err != nil {
 			if lastError != nil {
 				fmt.Fprintln(os.Stderr, lastError)

diff --git a/pkg/imageengine/buildah/remove_container.go b/pkg/imageengine/buildah/remove_container.go
@@ -53,7 +53,7 @@ func (engine *Engine) RemoveContainer(opts *options.RemoveContainerOptions) erro
 		}
 	} else {
 		for _, name := range opts.ContainerNamesOrIDs {
-			builder, err := openBuilder(getContext(), store, name)
+			builder, err := OpenBuilder(getContext(), store, name)
 			if err != nil {
 				lastError = util.WriteError(os.Stderr, errors.Wrapf(err, "%s %q", delContainerErrStr, name), lastError)
 				continue