Merge pull request #591 from nanobox-io/bugfix/584

Only pull 'nanobox/' images on 'update-images'
nanobox-io · Sep 26, 2017 · ce63663 · ce63663
2 parents a594af8 + 356e3a9
commit ce63663
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/processors/update.go b/processors/update.go
@@ -3,6 +3,7 @@
 package processors
 
 import (
+	"strings"
 	"time"
 
 	"github.com/jcelliott/lumber"
@@ -20,9 +21,6 @@ func Update() error {
 		return util.ErrorAppend(err, "failed to init docker client")
 	}
 
-	// // check to see if nanobox needs to update
-	// update.Check()
-
 	// update all the nanobox images
 	if err := pullImages(); err != nil {
 		return util.ErrorAppend(err, "failed to pull images")
@@ -44,12 +42,14 @@ func pullImages() error {
 		if image.Slug == "" {
 			continue
 		}
+		if !strings.Contains(image.Slug, "nanobox/") {
+			continue
+		}
 		display.StartTask("Pulling %s image", image.Slug)
 
 		// generate a docker percent display
 		dockerPercent := &display.DockerPercentDisplay{
 			Output: display.NewStreamer("info"),
-			// Prefix: buildImage,
 		}
 
 		// pull the build image

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -35,5 +35,7 @@ printf "\nBuilding nanobox updater...\n"
 # change into updater directory and build nanobox updater
 cd ./updater && gox -osarch "darwin/amd64 linux/amd64 windows/amd64" -ldflags="-s" -output="../.build/v2/{{.OS}}/{{.Arch}}/nanobox-update"
 
+cd ..
+
 printf "\nCompacting binaries...\n"
-upx ./.build/v2/darwin/amd64/nanobox-update ./.build/v2/darwin/amd64/nanobox ./.build/v2/windows/amd64/nanobox-update.exe ./.build/v2/windows/amd64/nanobox.exe ./.build/v2/linux/amd64/nanobox-update ./.build/v2/linux/amd64/nanobox
+upx ./.build/v2/*/amd64/nanobox*
diff --git a/util/odin/odin.go b/util/odin/odin.go
@@ -423,7 +423,7 @@ func doRequest(method, path string, params url.Values, requestBody, responseBody
 	}
 
 	if res.StatusCode < 200 || res.StatusCode >= 300 {
-		return util.ErrorfQuiet("[ODIN] bad exit response(%d %s %s %s (%s) %s)", res.StatusCode, req.Method, req.URL, req.Proto, res.Header.Get("Content-Length"), b)
+		return util.ErrorfQuiet("[ODIN] bad exit response(%d %s %s %s (%s) %s)", res.StatusCode, req.Method, strings.Replace(req.URL.String(), auth.Key, "REDACTED", -1), req.Proto, res.Header.Get("Content-Length"), b)
 	}
 
 	if responseBody != nil {