Skip to content

Commit 47e81c4

Browse files
authored
Merge pull request #435 from covexo/solve-nil-pointer-in-add
Fixed nil pointers in add-commands
2 parents 6f01820 + 379128b commit 47e81c4

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

pkg/devspace/configure/image.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ func AddImage(nameInConfig string, name string, tag string, contextPath string,
2929
log.Errorf("BuildEngine %v unknown. Please select one of docker|kaniko", buildEngine)
3030
}
3131

32+
if config.Images == nil {
33+
images := make(map[string]*v1.ImageConfig)
34+
config.Images = &images
35+
}
36+
3237
(*config.Images)[nameInConfig] = imageConfig
3338

3439
err := configutil.SaveConfig()
@@ -49,7 +54,7 @@ func RemoveImage(removeAll bool, names []string) error {
4954

5055
newImageList := make(map[string]*v1.ImageConfig)
5156

52-
if !removeAll {
57+
if !removeAll && config.Images != nil {
5358

5459
ImagesLoop:
5560
for nameInConfig, imageConfig := range *config.Images {

pkg/devspace/configure/service.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ func AddService(name string, labelSelector string, namespace string) error {
3333
}
3434
}
3535

36-
if *config.DevSpace.Services == nil {
36+
if config.DevSpace == nil {
37+
config.DevSpace = &v1.DevSpaceConfig{}
38+
}
39+
40+
if config.DevSpace.Services == nil {
3741
emptyServiceList := make([]*v1.ServiceConfig, 0)
3842
config.DevSpace.Services = &emptyServiceList
3943
}

pkg/devspace/configure/sync.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ import (
1515
func AddSyncPath(localPath, containerPath, namespace, labelSelector, excludedPathsString, serviceName string) error {
1616
config := configutil.GetConfig()
1717

18+
if config.DevSpace == nil {
19+
config.DevSpace = &v1.DevSpaceConfig{}
20+
}
21+
1822
if config.DevSpace.Sync == nil {
1923
config.DevSpace.Sync = &[]*v1.SyncConfig{}
2024
}

0 commit comments

Comments
 (0)