simono41/dockviz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

go fmt

Browse source
This commit is contained in:
Nate Jones 2018-04-16 17:08:57 -07:00
parent 51c099c18c
commit 4c4b3c154a
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
images.go
View file

@ -1,8 +1,8 @@
package main package main
import ( import (
"github.com/dustin/go-humanize"
"github.com/fsouza/go-dockerclient" "github.com/fsouza/go-dockerclient"
"github.com/dustin/go-humanize"
"bytes" "bytes"
"crypto/sha256" "crypto/sha256"
@ -468,8 +468,8 @@ func imagesToDot(buffer *bytes.Buffer, images []Image, byParent map[string][]Ima
// show partial command and size to make up for // show partial command and size to make up for
// the fact that since Docker 1.10 content addressing // the fact that since Docker 1.10 content addressing
// image ids are usually empty and report as <missing> // image ids are usually empty and report as <missing>
SanitizedCommand := SanitizeCommand(image.CreatedBy,30) SanitizedCommand := SanitizeCommand(image.CreatedBy, 30)
buffer.WriteString(fmt.Sprintf(" \"%s\" [label=\"%s\"]\n", truncate(image.Id, 12), truncate(stripPrefix(image.OrigId), 12)+ "\n" + SanitizedCommand + "\n" + humanize.Bytes(uint64(image.Size)) )) buffer.WriteString(fmt.Sprintf(" \"%s\" [label=\"%s\"]\n", truncate(image.Id, 12), truncate(stripPrefix(image.OrigId), 12)+"\n"+SanitizedCommand+"\n"+humanize.Bytes(uint64(image.Size))))
} }
if subimages, exists := byParent[image.Id]; exists { if subimages, exists := byParent[image.Id]; exists {
imagesToDot(buffer, subimages, byParent) imagesToDot(buffer, subimages, byParent)
@ -508,29 +508,28 @@ func jsonToShort(images *[]Image) string {
return buffer.String() return buffer.String()
} }
func SanitizeCommand(CommandStr string,MaxLength int) string { func SanitizeCommand(CommandStr string, MaxLength int) string {
temp := CommandStr temp := CommandStr
// remove prefixes that don't add meaning // remove prefixes that don't add meaning
if(strings.HasPrefix(temp,"/bin/sh -c")) { if strings.HasPrefix(temp, "/bin/sh -c") {
temp = strings.TrimSpace(temp[10:]) temp = strings.TrimSpace(temp[10:])
} }
if(strings.HasPrefix(temp,"#(nop)")) { if strings.HasPrefix(temp, "#(nop)") {
temp = strings.TrimSpace(temp[6:]) temp = strings.TrimSpace(temp[6:])
} }
// remove double and single quotes which make dot format invalid // remove double and single quotes which make dot format invalid
temp = strings.Replace(temp,"\""," ",-1) temp = strings.Replace(temp, "\"", " ", -1)
temp = strings.Replace(temp,"'"," ",-1) temp = strings.Replace(temp, "'", " ", -1)
// remove double spaces inside // remove double spaces inside
temp = strings.Join(strings.Fields(temp)," ") temp = strings.Join(strings.Fields(temp), " ")
return truncate(temp,MaxLength) return truncate(temp, MaxLength)
} }
func init() { func init() {
parser.AddCommand("images", parser.AddCommand("images",
"Visualize docker images.", "Visualize docker images.",