more debug info

Author: kcq

apps/docker-slim-sensor/artifacts.go

@@ -23,11 +23,11 @@ import (
 )
 
 const (
-	pycExt     = ".pyc"
-	pyoExt     = ".pyo"
-	pycacheDir = "/__pycache__/"
-	pycache    = "__pycache__"
-	defaultReportName = "creport.json"
+	pycExt                 = ".pyc"
+	pyoExt                 = ".pyo"
+	pycacheDir             = "/__pycache__/"
+	pycache                = "__pycache__"
+	defaultReportName      = "creport.json"
 	defaultArtifactDirName = "/opt/dockerslim/artifacts"
 )
 
@@ -182,7 +182,7 @@ func (p *artifactStore) saveArtifacts() {
 		}
 
 		var paths map[string]bool
-		for _,pathValue := range pathList {
+		for _, pathValue := range pathList {
 			pathInfo, err := os.Stat(pathValue)
 			if err != nil {
 				log.Debug("saveArtifacts.preparePaths(): skipping path = ", pathValue)
@@ -201,8 +201,8 @@ func (p *artifactStore) saveArtifacts() {
 
 	includePaths = preparePaths(p.cmd.Includes)
 	excludePaths = preparePaths(p.cmd.Excludes)
-	log.Debugf("includePaths: %+v\n",includePaths)
-	log.Debugf("excludePaths: %+v\n",excludePaths)
+	log.Debugf("includePaths: %+v\n", includePaths)
+	log.Debugf("excludePaths: %+v\n", excludePaths)
 
 	//TODO: use exludePaths to filter discovered files
 	for fileName := range p.fileMap {
@@ -242,17 +242,17 @@ func (p *artifactStore) saveArtifacts() {
 	for inPath, isDir := range includePaths {
 		dstPath := fmt.Sprintf("%s/files%s", p.storeLocation, inPath)
 		if isDir {
-			err, errs := utils.CopyDir(inPath,dstPath,true,true,nil,nil,nil)
-    		if err != nil {
-    			log.Warnf("CopyDir(%v,%v) error: %v\n",inPath,dstPath,err)
-    		}
-
-    		if len(errs) > 0 {
-    			log.Warnf("CopyDir(%v,%v) copy errors: %+v\n",inPath,dstPath,errs)
-    		}
+			err, errs := utils.CopyDir(inPath, dstPath, true, true, nil, nil, nil)
+			if err != nil {
+				log.Warnf("CopyDir(%v,%v) error: %v\n", inPath, dstPath, err)
+			}
+
+			if len(errs) > 0 {
+				log.Warnf("CopyDir(%v,%v) copy errors: %+v\n", inPath, dstPath, errs)
+			}
 		} else {
-			if err := utils.CopyFile(inPath,dstPath,true); err != nil {
-				log.Warnf("CopyFile(%v,%v) error: %v\n",inPath,dstPath,err)
+			if err := utils.CopyFile(inPath, dstPath, true); err != nil {
+				log.Warnf("CopyFile(%v,%v) error: %v\n", inPath, dstPath, err)
 			}
 		}
 	}

apps/docker-slim-sensor/main.go

@@ -86,7 +86,7 @@ func main() {
 	log.Infof("sensor: args => %#v\n", os.Args)
 
 	dirName, err := os.Getwd()
-	utils.FailOn(err)
+	utils.WarnOn(err)
 	log.Debugf("sensor: cwd => %#v\n", dirName)
 
 	initSignalHandlers()

apps/docker-slim/cli.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/cloudimmunity/docker-slim/consts"
 	"github.com/cloudimmunity/docker-slim/master/commands"
 	"github.com/cloudimmunity/docker-slim/master/config"
-	"github.com/cloudimmunity/docker-slim/consts"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/codegangsta/cli"
@@ -21,7 +21,7 @@ var app *cli.App
 
 func init() {
 	app = cli.NewApp()
-	app.Version = fmt.Sprintf("%v|%v|%v|%v",consts.APP_VERSION_NAME,appVersionTag,appVersionRev,appVersionTime)
+	app.Version = fmt.Sprintf("%v|%v|%v|%v", consts.APP_VERSION_NAME, appVersionTag, appVersionRev, appVersionTime)
 	app.Name = APP_NAME
 	app.Usage = APP_USAGE
 	app.CommandNotFound = func(ctx *cli.Context, command string) {

apps/docker-slim/version.go

@@ -1,7 +1,7 @@
 package main
 
 var (
-	appVersionTag = "latest"
-	appVersionRev = "latest"
+	appVersionTag  = "latest"
+	appVersionRev  = "latest"
 	appVersionTime = "latest"
 )

master/inspectors/container/container_inspector.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/cloudimmunity/docker-slim/master/config"
 	"github.com/cloudimmunity/docker-slim/master/docker/dockerhost"
@@ -23,6 +24,7 @@ import (
 type Inspector struct {
 	ContainerInfo     *dockerapi.Container
 	ContainerID       string
+	ContainerName     string
 	FatContainerCmd   []string
 	LocalVolumePath   string
 	CmdPort           dockerapi.Port
@@ -121,8 +123,10 @@ func (i *Inspector) RunContainer() error {
 		containerCmd = append(containerCmd, "-d")
 	}
 
+	i.ContainerName = fmt.Sprintf("dockerslimk_%v_%v", os.Getpid(), time.Now().UTC().Format("20060102150405"))
+
 	containerOptions := dockerapi.CreateContainerOptions{
-		Name: "dockerslimk",
+		Name: i.ContainerName,
 		Config: &dockerapi.Config{
 			Image: i.ImageInspector.ImageRef,
 			ExposedPorts: map[dockerapi.Port]struct{}{