kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Support container import of chroot directory

Browse Source
This commit is contained in:
Gregory Kurtzer
2021-02-24 21:01:56 -08:00
parent 5a07ac2e14
commit 6357e31438
3 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/app/wwctl/container/exec/main.go
View File

@@ -38,12 +38,12 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
fmt.Printf("Rebuilding container...\n")
output, err := container.Build(containerName, false)
err := container.Build(containerName, false)
if err != nil {
wwlog.Printf(wwlog.ERROR, "Could not build container %s: %s\n", containerName, err)
os.Exit(1)
} else {
fmt.Printf("%s\n", output)
//fmt.Printf("%s\n", output)
}
return nil

33
internal/app/wwctl/container/imprt/main.go
View File

@@ -5,6 +5,7 @@ import (
"os"
"path"
"strconv"
"strings"
"github.com/containers/image/v5/types"
"github.com/hpcng/warewulf/internal/pkg/container"
@@ -85,38 +86,46 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
if util.IsDir(fullPath) == true {
if SetForce == true {
wwlog.Printf(wwlog.WARN, "Overwriting existing VNFS\n")
fmt.Printf("Overwriting existing VNFS\n")
err := os.RemoveAll(fullPath)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
}
} else if SetUpdate == true {
wwlog.Printf(wwlog.WARN, "Updating existing VNFS\n")
fmt.Printf("Updating existing VNFS\n")
} else {
wwlog.Printf(wwlog.ERROR, "VNFS Name exists, specify --force, --update, or choose a different name: %s\n", name)
os.Exit(1)
}
}
sCtx, err := getSystemContext()
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
}
if strings.HasPrefix(uri, "docker://") || strings.HasPrefix(uri, "docker-daemon://") {
sCtx, err := getSystemContext()
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
}
err = container.PullURI(uri, name, sCtx)
if err != nil {
wwlog.Printf(wwlog.ERROR, "Could not pull image: %s\n", err)
os.Exit(1)
err = container.ImportDocker(uri, name, sCtx)
if err != nil {
wwlog.Printf(wwlog.ERROR, "Could not import image: %s\n", err)
os.Exit(1)
}
} else if util.IsDir(uri) {
err := container.ImportDirectory(uri, name)
if err != nil {
wwlog.Printf(wwlog.ERROR, "Could not import image: %s\n", err)
os.Exit(1)
}
}
fmt.Printf("Building container: %s\n", name)
output, err := container.Build(name, true)
err := container.Build(name, true)
if err != nil {
wwlog.Printf(wwlog.ERROR, "Could not build container %s: %s\n", name, err)
os.Exit(1)
} else {
fmt.Printf("%s: %s\n", name, output)
//fmt.Printf("%s: %s\n", name, output)
}
if SetDefault == true {