Merge pull request #1641 from anderbubble/rename-container-node-image

Rename "container" to "image"

overlays/debug/internal/debug_test.go

@@ -75,7 +75,7 @@ data from other structures.
 - Hostname: node1
 - Comment: 
 - ClusterName: 
-- ContainerName: rockylinux-9
+- ImageName: rockylinux-9
 - Ipxe: default
 - RuntimeOverlay: hosts,ssh.authorized_keys,syncuser
 - SystemOverlay: wwinit,wwclient,fstab,hostname,ssh.host_keys,issue,resolv,udev.netname,systemd.netname,ifcfg,NetworkManager,debian.interfaces,wicked,ignition
@@ -187,7 +187,7 @@ data from other structures.
   - Id: node1
   - Comment: 
   - ClusterName: 
-  - ContainerName: rockylinux-9
+  - ImageName: rockylinux-9
   - Ipxe: default
   - RuntimeOverlay: [hosts ssh.authorized_keys syncuser]
   - SystemOverlay: [wwinit wwclient fstab hostname ssh.host_keys issue resolv udev.netname systemd.netname ifcfg NetworkManager debian.interfaces wicked ignition]
@@ -244,7 +244,7 @@ data from other structures.
   - Id: node2
   - Comment: 
   - ClusterName: 
-  - ContainerName: 
+  - ImageName: 
   - Ipxe: default
   - RuntimeOverlay: [hosts ssh.authorized_keys syncuser]
   - SystemOverlay: [wwinit wwclient fstab hostname ssh.host_keys issue resolv udev.netname systemd.netname ifcfg NetworkManager debian.interfaces wicked ignition]

overlays/debug/internal/nodes.conf

@@ -28,7 +28,7 @@ nodes:
   node1:
     profiles:
     - default
-    container name: rockylinux-9
+    image name: rockylinux-9
     network devices:
       default:
         device: wwnet0

overlays/debug/rootfs/warewulf/template-variables.md.ww

@@ -17,7 +17,7 @@ data from other structures.
 - Hostname: {{ .Hostname }}
 - Comment: {{ .Comment }}
 - ClusterName: {{ .ClusterName }}
-- ContainerName: {{ .ContainerName }}
+- ImageName: {{ .ImageName }}
 - Ipxe: {{ .Ipxe }}
 - RuntimeOverlay: {{ range $index, $value := .RuntimeOverlay }}{{ if $index }},{{ end }}{{ $value }}{{ end }}
 - SystemOverlay: {{ range $index, $value := .SystemOverlay }}{{ if $index }},{{ end }}{{ $value }}{{ end }}
@@ -130,7 +130,7 @@ data from other structures.
   - Id: {{ $node.Id }}
   - Comment: {{ $node.Comment }}
   - ClusterName: {{ $node.ClusterName }}
-  - ContainerName: {{ $node.ContainerName }}
+  - ImageName: {{ $node.ImageName }}
   - Ipxe: {{ $node.Ipxe }}
   - RuntimeOverlay: {{ $node.RuntimeOverlay }}
   - SystemOverlay: {{ $node.SystemOverlay }}

overlays/issue/internal/issue_test.go

@@ -51,7 +51,7 @@ const issue string = `backupFile: true
 writeFile: true
 Filename: etc/issue
 Warewulf Node:      node1
-Container:          rockylinux-9
+Image:              rockylinux-9
 Kernelargs:         quiet crashkernel=no vga=791 net.naming-scheme=v238
 
 Network:

overlays/issue/internal/nodes.conf

@@ -1,6 +1,6 @@
 nodes:
   node1:
-    container name: rockylinux-9
+    image name: rockylinux-9
     kernel:
       args: quiet crashkernel=no vga=791 net.naming-scheme=v238
     network devices:

overlays/issue/rootfs/etc/issue.ww

@@ -1,5 +1,5 @@
 Warewulf Node:      {{.Id}}
-Container:          {{.Container}}
+Image:              {{.ImageName}}
 {{ if .Kernel.Version }}Kernel:             {{.Kernel.Version}} {{ end -}}
 Kernelargs:         {{.Kernel.Args}}
 

overlays/syncuser/rootfs/etc/group.ww

@@ -1,2 +1,2 @@
-{{IncludeFrom $.Container "/etc/group"}}
-{{Include "/etc/group"}}
+{{IncludeFrom $.ImageName "/etc/group"}}
+{{Include "/etc/group"}}

overlays/syncuser/rootfs/etc/passwd.ww

@@ -1,4 +1,4 @@
 # Uncomment the following line to enable passwordless root login
 # root::0:0:root:/root:/bin/bash
-{{IncludeFrom $.Container "/etc/passwd"}}
-{{Include "/etc/passwd"}}
+{{IncludeFrom $.ImageName "/etc/passwd"}}
+{{Include "/etc/passwd"}}

overlays/wwinit/internal/nodes.conf

@@ -3,7 +3,7 @@ nodes:
     init: /sbin/init
     root: initramfs
     ipxe template: default
-    container name: rockylinux-9
+    image name: rockylinux-9
     ipmi:
       username: user
       password: password

overlays/wwinit/internal/wwinit_test.go

@@ -85,7 +85,7 @@ nfs:
 const wwinit_config string = `backupFile: true
 writeFile: true
 Filename: warewulf/config
-WWCONTAINER=rockylinux-9
+WWIMAGE=rockylinux-9
 WWHOSTNAME=node1
 WWROOT=initramfs
 WWINIT=/sbin/init

overlays/wwinit/rootfs/warewulf/config.ww

@@ -1,4 +1,4 @@
-WWCONTAINER={{$.Container}}
+WWIMAGE={{$.ImageName}}
 WWHOSTNAME={{$.Id}}
 WWROOT={{$.Root}}
 WWINIT={{$.Init}}