Rename "container" to "image"

- Updated `wwctl upgrade` to handle updates
- Maintained `.Container` and `.ContainerName` in tstruct
- Added `ContainerName()` methods to node and profile objects
- Added `--container`, `-C` aliases to wwctl commands (`<node|profile> <add|set>`)
- Added `wwctl container` alias
- Added support for `container_exit.sh` if `image_exit.sh` is not found

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-01-18 17:34:48 -07:00
parent 96396ed47e
commit 45a690ca4e
142 changed files with 2212 additions and 2183 deletions

View File

@@ -0,0 +1,50 @@
package copy
import (
"fmt"
"github.com/spf13/cobra"
"github.com/warewulf/warewulf/internal/pkg/api/routes/wwapiv1"
"github.com/warewulf/warewulf/internal/pkg/image"
"github.com/warewulf/warewulf/internal/pkg/wwlog"
)
func CobraRunE(cmd *cobra.Command, args []string) (err error) {
if len(args) > 2 {
wwlog.Warn("copy only requires 2 arguments but you provided %d arguments. Hence, they will be ignored.", len(args))
}
cdp := &wwapiv1.ImageCopyParameter{
ImageSource: args[0],
ImageDestination: args[1],
Build: Build,
}
if !image.DoesSourceExist(cdp.ImageSource) {
return fmt.Errorf("image's source doesn't exists: %s", cdp.ImageSource)
}
if !image.ValidName(cdp.ImageDestination) {
return fmt.Errorf("image name contains illegal characters : %s", cdp.ImageDestination)
}
if image.DoesSourceExist(cdp.ImageDestination) {
return fmt.Errorf("an other image with name: %s already exists in sources", cdp.ImageDestination)
}
err = image.Duplicate(cdp.ImageSource, cdp.ImageDestination)
if err != nil {
return fmt.Errorf("could not duplicate image: %s", err.Error())
}
if cdp.Build {
err = image.Build(cdp.ImageDestination, true)
if err != nil {
return err
}
}
wwlog.Info("Image %s successfully duplicated as %s", cdp.ImageSource, cdp.ImageDestination)
return
}

View File

@@ -0,0 +1,33 @@
package copy
import (
"path"
"testing"
"github.com/stretchr/testify/assert"
"github.com/warewulf/warewulf/internal/pkg/testenv"
"github.com/warewulf/warewulf/internal/pkg/warewulfd"
)
func Test_Copy(t *testing.T) {
env := testenv.New(t)
env.WriteFile(path.Join(testenv.WWChrootdir, "test-image/rootfs/bin/sh"), `test`)
defer env.RemoveAll()
warewulfd.SetNoDaemon()
t.Run("image copy without build", func(t *testing.T) {
baseCmd := GetCommand()
baseCmd.SetArgs([]string{"test-image", "test-image-copy-without-build"})
err := baseCmd.Execute()
assert.NoError(t, err)
assert.NoFileExists(t, path.Join(env.BaseDir, testenv.WWProvisiondir, "image", "test-image-copy-without-build.img"))
})
t.Run("image copy with build", func(t *testing.T) {
baseCmd := GetCommand()
baseCmd.SetArgs([]string{"-b", "test-image", "test-image-copy"})
err := baseCmd.Execute()
assert.NoError(t, err)
assert.FileExists(t, path.Join(env.BaseDir, testenv.WWProvisiondir, "image", "test-image-copy.img"))
})
}

View File

@@ -0,0 +1,35 @@
package copy
import (
"github.com/spf13/cobra"
"github.com/warewulf/warewulf/internal/pkg/image"
)
var (
baseCmd = &cobra.Command{
DisableFlagsInUseLine: true,
Use: "copy IMAGE NEW_NAME",
Aliases: []string{"cp"},
Short: "Copy an existing image",
Long: "This command will duplicate an imported image.",
RunE: CobraRunE,
Args: cobra.MinimumNArgs(2),
ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
if len(args) != 0 {
return nil, cobra.ShellCompDirectiveNoFileComp
}
list, _ := image.ListSources()
return list, cobra.ShellCompDirectiveNoFileComp
},
}
Build bool
)
func init() {
baseCmd.PersistentFlags().BoolVarP(&Build, "build", "b", false, "Build image after copy")
}
// GetRootCommand returns the root cobra.Command for the application.
func GetCommand() *cobra.Command {
return baseCmd
}