@@ -60,11 +60,19 @@ func dockerHoverBuild(targetOS string, packagingTask packaging.Task, buildFlags
60
60
dockerArgs = append (dockerArgs , "--env" , "HOVER_SAFE_CHOWN_UID=" + currentUser .Uid )
61
61
dockerArgs = append (dockerArgs , "--env" , "HOVER_SAFE_CHOWN_GID=" + currentUser .Gid )
62
62
}
63
- if goproxy := os .Getenv ("GOPROXY" ); goproxy != "" {
64
- dockerArgs = append (dockerArgs , "--env" , "GOPROXY=" + goproxy )
63
+ goproxy , err := exec .Command ("go" , "env" , "GOPROXY" ).Output ()
64
+ if err != nil {
65
+ log .Errorf ("Failed to get GOPROXY: %v" , err )
66
+ }
67
+ if string (goproxy ) != "" {
68
+ dockerArgs = append (dockerArgs , "--env" , "GOPROXY=" + string (goproxy ))
69
+ }
70
+ goprivate , err := exec .Command ("go" , "env" , "GOPRIVATE" ).Output ()
71
+ if err != nil {
72
+ log .Errorf ("Failed to get GOPRIVATE: %v" , err )
65
73
}
66
- if goprivate := os . Getenv ( "GOPRIVATE" ); goprivate != "" {
67
- dockerArgs = append (dockerArgs , "--env" , "GOPRIVATE=" + goprivate )
74
+ if string ( goprivate ) != "" {
75
+ dockerArgs = append (dockerArgs , "--env" , "GOPRIVATE=" + string ( goprivate ) )
68
76
}
69
77
if len (vmArguments ) > 0 {
70
78
// I (GeertJohan) am not too happy with this, it make the hover inside
0 commit comments