modify commit command

xwjahahahaha · Nov 15, 2021 · f08cc3e · f08cc3e
1 parent ecb22a3
commit f08cc3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cmd/commands.go b/cmd/commands.go
@@ -60,12 +60,12 @@ var runDocker = &cobra.Command{
 }
 
 var commitCommand = &cobra.Command{
-	Use:   "commit [image_name]",
+	Use:   "commit [container_id] [image_tar_name]",
 	Short: "commit a container into image",
 	Long:  "commit a container into image",
-	Args:  cobra.ExactArgs(1),
+	Args:  cobra.ExactArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
-		container.CommitContainer(args[0])
+		container.CommitContainer(args[0], args[1])
 	},
 }
 

diff --git a/container/commit.go b/container/commit.go
@@ -2,14 +2,15 @@ package container
 
 import (
 	"os/exec"
+	"path/filepath"
 	"xwj/mydocker/log"
 )
 
 // CommitContainer
 // @Description: 打包一个容器
 // @param imageName
-func CommitContainer(imageName string) {
-	mntUrl := "./mnt"
+func CommitContainer(containerID, imageName string) {
+	mntUrl := filepath.Join(ROOTURL, "mnt", containerID)
 	imageTarUrl := "./" + imageName + ".tar"
 	if _, err := exec.Command("tar", "-czf", imageTarUrl, "-C", mntUrl, ".").CombinedOutput(); err != nil {
 		log.LogErrorFrom("CommitContainer", "tar", err)