From 3cf557ebe7ad820d20d1d4bcf5adfed7f1b0ba10 Mon Sep 17 00:00:00 2001 From: Steven Polley Date: Wed, 1 Aug 2018 22:34:29 -0600 Subject: [PATCH] Fix IP address print Fix docker repo Fix local build tasks --- .drone.yml | 2 +- .vscode/tasks.json | 9 ++------- render.go | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6e4ba3e..6e36bac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ pipeline: - go build publish: image: plugins/docker - repo: deadbeef.codes:5000/mandelmap + repo: deadbeef.codes:5000/mandelmapper registry: deadbeef.codes:5000 auto_tag: true auto_tag_suffix: ${DRONE_COMMIT} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7592127..9c98595 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,7 @@ { "label": "Local Build", "type": "shell", - "command": "cd mandelmapper ; go build", + "command": "go build ; ./mandelmapper", "group": { "kind": "build", "isDefault": true @@ -15,12 +15,7 @@ { "label": "Raspberry Pi 3 Build", "type": "shell", - "command": "cd mandelmapper ; export GOOS=linux ; export GOARCH=arm ; export GOARM=7 ; go build", - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": [] + "command": "export GOOS=linux ; export GOARCH=arm ; export GOARM=7 ; go build" } ] } \ No newline at end of file diff --git a/render.go b/render.go index 9199920..157e0aa 100644 --- a/render.go +++ b/render.go @@ -122,7 +122,7 @@ func renderTile(w http.ResponseWriter, r *http.Request) { ip := GetOutboundIP() - addLabel(img, 20, 30, fmt.Sprintf("%s", string(ip))) + addLabel(img, 20, 30, fmt.Sprintf("%s", ip.String())) //addLabel(img, 20, 30, fmt.Sprintf("%s/%s/%s.png", components[1], components[2], components[3])) w.Header().Set("Content-Type", "image/png") png.Encode(w, img)