Skip to content

Commit 788eec5

Browse files
author
jld3103
authored
Fix docker GOPROXY (#114)
1 parent 07c217f commit 788eec5

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

cmd/docker.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,19 @@ func dockerHoverBuild(targetOS string, packagingTask packaging.Task, buildFlags
6060
dockerArgs = append(dockerArgs, "--env", "HOVER_SAFE_CHOWN_UID="+currentUser.Uid)
6161
dockerArgs = append(dockerArgs, "--env", "HOVER_SAFE_CHOWN_GID="+currentUser.Gid)
6262
}
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)
6573
}
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))
6876
}
6977
if len(vmArguments) > 0 {
7078
// I (GeertJohan) am not too happy with this, it make the hover inside

0 commit comments

Comments
 (0)