fix a bug when replacing existing containers

Signed-off-by: jason yang <[email protected]>
JasonYangShadow · Dec 12, 2023 · efcffbd · efcffbd
1 parent 9c698d7
commit efcffbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed a bug where profile tags were erroneously overridden by empty node
   values. #884
 - Fixed bug where tags from profiles weren't rendered #967
+- Fixed a bug when using `wwctl container import --force` to replace an existing container
+  will generate an error #474
 
 ### Changed
 

diff --git a/internal/pkg/api/container/container.go b/internal/pkg/api/container/container.go
@@ -190,7 +190,9 @@ func ContainerImport(cip *wwapiv1.ContainerImportParameter) (containerName strin
 			wwlog.Error(err.Error())
 			return
 		}
-	} else if strings.HasPrefix(cip.Source, "docker://") || strings.HasPrefix(cip.Source, "docker-daemon://") ||
+	}
+
+	if strings.HasPrefix(cip.Source, "docker://") || strings.HasPrefix(cip.Source, "docker-daemon://") ||
 		strings.HasPrefix(cip.Source, "file://") || util.IsFile(cip.Source) {
 		var sCtx *types.SystemContext
 		sCtx, err = getSystemContext()