support for older versions of buildah, and some caching improvements

Author: bRuttaZz

README.md

@@ -20,7 +20,9 @@
 1. [Intro](#intro)
 2. [Usage](#usage)
 3. [Installation](#installation)
-4. [Credits](#credits)
+4. [Uninstalling](#uninstalling)
+5. [Known Issues](#known-issues)
+6. [Credits](#credits)
 
 <!-- </details> -->
 
@@ -99,7 +101,7 @@ If everything went well, your terminal prompt will be prefixed with `(devc)` (th
 Again simple, as devc is not running any demon processes, one can execute `deactivate` to deactivate the session, or `ctrl + d` combo to quit the terminal.
 
 ### 4. Removing the venv
-**In a normal usecase one can simply delete the env directory** from the UI after use. If you are using some advanced features on devc at env creation time, you may have to look into the `devc rm` command. refer the [manual](./misc/man.md)
+**In a normal usecase one can simply delete the env directory** from the UI after use (yeah for the CLI people, you got `rm -r` option as well).
 
 ## Installation
 
@@ -162,7 +164,7 @@ In addition devc may have installed `buildah` and it's dependencies. You can sim
 * [Buildah](https://github.com/containers/buildah) 
 
 ## Known Issues
-* Currently there is some problem regarding issuing apt update in ubuntu/deb based images
+* Currently there is some problem regarding issuing apt update in ubuntu/deb based images (gpg key update related issues)
 * Some mount points has to be refined. Think some of them are useless at times. (It's hard to generalize between different distros)
 
 ## TODOs

VERSION

@@ -1 +1 @@
-v1.0.0
+v1.1.0

cmd/rm.go

@@ -42,7 +42,6 @@ func init() {
 	rootCmd.AddCommand(loginCmd)
 	rootCmd.AddCommand(logoutCmd)
 	rootCmd.AddCommand(imagesCmd)
-	rootCmd.AddCommand(rmCmd)
 	rootCmd.AddCommand(rmiCmd)
 	rootCmd.AddCommand(pullCmd)
 	rootCmd.AddCommand(pruneCmd)

cmd/root.go

@@ -20,38 +20,51 @@ func Builder(opts *configs.BuildCmdOptions, args []string) {
 	if err != nil {
 		panic("[build error] error resolve path : " + err.Error())
 	}
-	var baseOptions = append(getGlobalBuildahOptions(abs, args[0]), getBuildOptions(abs, args[0])...)
-	authFileOpts, err := getAuthFileOptions()
+	_, err = os.Stat(filepath.Join(abs, args[0]))
+	if err == nil {
+		panic("[ERROR] directory already exists! '" + args[0] + "'")
+	}
+	var globalOptions = getGlobalBuildahOptions()
+	imgName, buildOptions, err := getBuildOptions()
 	if err != nil {
-		panic("[devc error] : " + err.Error())
+		panic("[devc error] getting builder options : " + err.Error())
 	}
-	baseOptions = append(baseOptions, authFileOpts...)
+	buildOptions = append(globalOptions, buildOptions...)
 	for i := 0; i < len(opts.BuildArgs); i++ {
-		baseOptions = append(baseOptions, []string{"--build-arg", opts.BuildArgs[i]}...)
+		buildOptions = append(buildOptions, []string{"--build-arg", opts.BuildArgs[i]}...)
 	}
 
 	if len(opts.Containerfile) > 0 {
-		baseOptions = append(baseOptions, "--file")
-		baseOptions = append(baseOptions, filepath.Join(abs, opts.Containerfile))
+		buildOptions = append(buildOptions, "--file")
+		buildOptions = append(buildOptions, filepath.Join(abs, opts.Containerfile))
 	}
-	baseOptions = append(baseOptions, filepath.Join(abs, opts.Context))
+	buildOptions = append(buildOptions, filepath.Join(abs, opts.Context))
 
-	// fmt.Println("options", buildCmd.Path, buildCmd.Args)
-	err = runCommand(configs.Config.Buildah.Path, baseOptions)
+	fmt.Println("[devc] building container..")
+	err = runCommand(configs.Config.Buildah.Path, buildOptions)
 	if err != nil {
-		panic("[builder error] : " + err.Error())
+		panic("[builder error] stage 1 : " + err.Error())
 	}
-	fmt.Println("[devc] container created")
+	fmt.Println("[devc] image created..")
+	fmt.Println("[devc] creating devc env ")
+
+	err = exportImageAsRootFs(imgName, filepath.Join(abs, args[0], configs.Config.EnvSettings.RootDir))
+	if err != nil {
+		panic("[devc] mount error : " + err.Error())
+	}
+
 	err = env.SetupEnv(filepath.Join(abs, args[0]))
 	if err != nil {
 		panic("[setup error] : " + err.Error())
 	}
 	fmt.Printf("[devc] env created : %v\n", args[0])
 	if !opts.KeepCache {
-		err = clearBuildCache(args[0])
-		if err != nil {
-			panic("[finishup error] : " + err.Error())
-		}
+		defer func() {
+			if v := recover(); v != nil {
+				panic(fmt.Sprint("[finishup error] : ", v))
+			}
+		}()
+		Rmi(&configs.RmiCmdOptions{}, []string{imgName})
 	}
 	fmt.Printf("\n[devc] tada! the env is all yours : [%v]\n", args[0])
 }
@@ -82,66 +95,43 @@ func Activate(opts *configs.ActivateCmdOptions, args []string) {
 
 // pull images and create env
 func Pull(opts *configs.PullCmdOptions, args []string) {
-	if len(args) != 2 {
-		panic("Invalid number of positional argument. Execute command with --help to get detailed usecase")
-	}
-	file, err := os.CreateTemp("", "pullcmd")
-	if err != nil {
-		panic("[pull error] : " + err.Error())
-	}
-	defer file.Close()
-	defer os.Remove(file.Name())
-	_, err = file.Write([]byte(fmt.Sprintf("FROM %v", args[0])))
-	if err != nil {
-		panic("[pull error] : " + err.Error())
-	}
 
 	abs, err := filepath.Abs("")
 	if err != nil {
 		panic("[pull error] error resolve path : " + err.Error())
 	}
-
-	var baseOptions = append(getGlobalBuildahOptions("", ""), getBuildOptions(abs, args[1])...)
-	authFileOpts, err := getAuthFileOptions()
-	if err != nil {
-		panic("[devc error] : " + err.Error())
+	_, err = os.Stat(filepath.Join(abs, args[1]))
+	if err == nil {
+		panic("[ERROR] directory already exists! '" + args[1] + "'")
 	}
-	baseOptions = append(baseOptions, authFileOpts...)
-
-	baseOptions = append(baseOptions, "--file")
-	baseOptions = append(baseOptions, file.Name())
-	baseOptions = append(baseOptions, ".")
-
-	// fmt.Println("options", buildCmd.Path, buildCmd.Args)
-	err = runCommand(configs.Config.Buildah.Path, baseOptions)
+	err = exportImageAsRootFs(args[0], filepath.Join(abs, args[1], configs.Config.EnvSettings.RootDir))
 	if err != nil {
-		panic("[pull error] : " + err.Error())
+		panic("[devc] mount error : " + err.Error())
 	}
-	fmt.Println("[devc] container created..")
+
 	err = env.SetupEnv(filepath.Join(abs, args[1]))
 	if err != nil {
 		panic("[setup error] : " + err.Error())
 	}
+	fmt.Printf("[devc] env created : %v\n", args[1])
 	if opts.NoCaching {
-		baseOptions = getGlobalBuildahOptions("", "")
-		baseOptions = append(baseOptions, "rmi")
-		baseOptions = append(baseOptions, args[0])
-
-		err := runCommand(configs.Config.Buildah.Path, baseOptions)
-		if err != nil {
-			panic("[devc cleanup error] : " + err.Error())
-		}
-		fmt.Println("[devc] pull cache removed..")
+		defer func() {
+			if v := recover(); v != nil {
+				panic(fmt.Sprint("[finishup error] : ", v))
+			}
+		}()
+		Rmi(&configs.RmiCmdOptions{}, []string{args[0]})
 	}
 	fmt.Printf("\n[devc] tada! the env is all yours : [%v]\n", args[1])
+
 }
 
 // login to a registry
 func Login(opts *configs.LoginCmdOptions, args []string) {
 	if len(args) != 1 {
 		panic("Invalid number of positional argument. Execute command with --help to get detailed usecase")
 	}
-	var baseOptions = getGlobalBuildahOptions("", "")
+	var baseOptions = getGlobalBuildahOptions()
 	baseOptions = append(baseOptions, "login")
 	authFileOpts, err := getAuthFileOptions()
 	if err != nil {
@@ -174,7 +164,7 @@ func Logout(opts *configs.LogoutCmdOptions, args []string) {
 	if len(args) != 1 {
 		panic("Invalid number of positional argument. Execute command with --help to get detailed usecase")
 	}
-	var baseOptions = getGlobalBuildahOptions("", "")
+	var baseOptions = getGlobalBuildahOptions()
 	baseOptions = append(baseOptions, "logout")
 	authFileOpts, err := getAuthFileOptions()
 	if err != nil {
@@ -196,7 +186,7 @@ func Images(opts *configs.ImagesCmdOptions, args []string) {
 		panic("Invalid number of positional argument. Execute command with --help to get detailed usecase")
 	}
 
-	var baseOptions = getGlobalBuildahOptions("", "")
+	var baseOptions = getGlobalBuildahOptions()
 	baseOptions = append(baseOptions, "images")
 	// fmt.Println("options", buildCmd.Path, buildCmd.Args)
 	err := runCommand(configs.Config.Buildah.Path, baseOptions)
@@ -210,7 +200,7 @@ func Prune(opts *configs.PruneCmdOptions, args []string) {
 	if len(args) != 0 {
 		panic("Invalid number of positional argument. Execute command with --help to get detailed usecase")
 	}
-	err := clearBuildCache("")
+	err := clearBuildCache()
 	if err != nil {
 		panic("[devc prune error] : " + err.Error())
 	}
@@ -221,33 +211,12 @@ func Prune(opts *configs.PruneCmdOptions, args []string) {
 	fmt.Println("[devc] system prune complete!")
 }
 
-// Remove an existing devc env (simply deleting it will also work)
-func Rm(opts *configs.RmCmdOptions, args []string) {
-	if len(args) != 1 {
-		panic("Invalid number of positional argument. Execute command with --help to get detailed usecase")
-	}
-	// check if it's a valid env
-	_, err := os.Stat(filepath.Join(args[0], configs.Config.EnvSettings.DevcBin, "activate"))
-	if err != nil {
-		panic("[devc rm error] : seems not to be a devc environment")
-	}
-	err = clearBuildCache(args[0])
-	if err != nil {
-		panic("[devc rm error] : " + err.Error())
-	}
-	err = runCommand("rm", []string{"-rf", args[0]})
-	if err != nil {
-		panic("[devc rm error] : " + err.Error())
-	}
-	fmt.Println("[devc] env removed successfully!")
-}
-
 // Remove a cached image (cache is only applicable for devc pull command)
 func Rmi(opts *configs.RmiCmdOptions, args []string) {
 	if len(args) != 1 {
 		panic("Invalid number of positional argument. Execute command with --help to get detailed usecase")
 	}
-	options := getGlobalBuildahOptions("", "")
+	options := getGlobalBuildahOptions()
 	options = append(options, "rmi")
 	options = append(options, args[0])
 

internal/builder/cli.go

@@ -1,7 +1,7 @@
 package builder
 
 import (
-	"fmt"
+	// "fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -24,16 +24,9 @@ func runCommand(name string, cmd []string) (err error) {
 }
 
 // provide global options for buildah
-// args:
-//
-//	envPath - env path
-func getGlobalBuildahOptions(abs, envPath string) (cmd []string) {
+func getGlobalBuildahOptions() (cmd []string) {
 	var rootPath string
-	if len(envPath) > 0 {
-		rootPath = filepath.Join(abs, envPath, configs.Config.EnvSettings.BuildDir)
-	} else {
-		rootPath = filepath.Join(configs.Config.CacheDir, configs.Config.CacheDirSettings.BuildahCache)
-	}
+	rootPath = filepath.Join(configs.Config.CacheDir, configs.Config.CacheDirSettings.BuildahCache)
 	cmd = []string{
 		"--root",
 		rootPath,
@@ -55,25 +48,26 @@ func getAuthFileOptions() (cmd []string, err error) {
 }
 
 // get bulid command options
-// args:
-//
-//	envPath - env path
-func getBuildOptions(abs, envPath string) (cmd []string) {
+func getBuildOptions() (imageName string, cmd []string, err error) {
+	var authFileOptions []string
+	authFileOptions, err = getAuthFileOptions()
+	imageName = utils.CreateRandomString()
 	cmd = []string{
 		"build",
+		"--force-rm",
 		"--rm",
 		"--layers=false",
-		fmt.Sprintf(
-			"--output=type=local,dest=%v",
-			filepath.Join(abs, envPath, configs.Config.EnvSettings.RootDir),
-		),
+		"--tag",
+		imageName,
+		authFileOptions[0],
+		authFileOptions[1],
 	}
 	return
 }
 
 // garbage collection
-func clearBuildCache(envPath string) (err error) {
-	var options = getGlobalBuildahOptions("", envPath)
+func clearBuildCache() (err error) {
+	var options = getGlobalBuildahOptions()
 	options = append(options, "prune")
 	options = append(options, "-af")
 	err = runCommand(configs.Config.Buildah.Path, options)

internal/builder/common.go

@@ -0,0 +1,45 @@
+package builder
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/bruttazz/devc/internal/configs"
+	"github.com/bruttazz/devc/internal/utils"
+)
+
+const rootfsExtracterScript string = `#!/bin/sh 
+
+ctrName=$( __BUILDAH_BASE_EXEC from __IMAGE_NAME )
+mountName=$( __BUILDAH_BASE_EXEC mount $ctrName )
+mkdir -p $(dirname __OUT_ROOT)
+cp -r $mountName __OUT_ROOT
+chmod -R u+rwx __OUT_ROOT
+__BUILDAH_BASE_EXEC umount $ctrName 
+__BUILDAH_BASE_EXEC rm $ctrName  
+`
+
+func exportImageAsRootFs(imageName, outDirPath string) (err error) {
+	var cmdLines = configs.Config.Buildah.Path + " " + strings.Join(getGlobalBuildahOptions(), " ")
+	cmdLines = strings.ReplaceAll(rootfsExtracterScript, "__BUILDAH_BASE_EXEC", cmdLines)
+	cmdLines = strings.ReplaceAll(cmdLines, "__IMAGE_NAME", imageName)
+	cmdLines = strings.ReplaceAll(cmdLines, "__OUT_ROOT", outDirPath)
+
+	// actual tempfile got issue on forking the defer command gets to do something
+	fileName := filepath.Join(configs.Config.CacheDir, "_temp_script_"+imageName+".sh")
+	err = utils.WriteTextToFile(fileName, cmdLines)
+	defer os.Remove(fileName)
+	if err != nil {
+		return
+	}
+	err = utils.MakeExecutable(fileName)
+	if err != nil {
+		return
+	}
+	err = runCommand(configs.Config.Buildah.Path, []string{
+		"unshare",
+		fileName,
+	})
+	return
+}

internal/builder/mounting.go

@@ -34,8 +34,5 @@ type PullCmdOptions struct {
 	NoCaching bool
 }
 
-type RmCmdOptions struct {
-}
-
 type RmiCmdOptions struct {
 }