fix: Initialize nil maps in image config

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Azure · Dec 9, 2024 · 99ec471 · 99ec471
1 parent 1398335
commit 99ec471
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/imgconfig.go b/imgconfig.go
@@ -36,12 +36,22 @@ func MergeSpecImage(spec *Spec, targetKey string) *ImageConfig {
 
 		cfg.Env = append(cfg.Env, i.Env...)
 
-		for k, v := range i.Volumes {
-			cfg.Volumes[k] = v
+		if len(i.Volumes) > 0 {
+			if cfg.Volumes == nil {
+				cfg.Volumes = make(map[string]struct{}, len(i.Volumes))
+			}
+			for k, v := range i.Volumes {
+				cfg.Volumes[k] = v
+			}
 		}
 
-		for k, v := range i.Labels {
-			cfg.Labels[k] = v
+		if len(i.Labels) > 0 {
+			if cfg.Labels == nil {
+				cfg.Labels = make(map[string]string, len(i.Labels))
+			}
+			for k, v := range i.Labels {
+				cfg.Labels[k] = v
+			}
 		}
 
 		if i.WorkingDir != "" {