logging ehnacements and cleanup; console message updates for the build command

Author: kcq

README.md

@@ -185,8 +185,11 @@ Commands:
 
 Global options:
 
-* ` --version` - print the version
-* ` --debug` - enable debug logs
+* `--version` - print the version
+* `--debug` - enable debug logs
+* `--log-level` - set the format used by logs ('text' (default), or 'json')
+* `--log-format` - set the format used by logs ('text' (default), or 'json')
+* `--log` - log file to store logs
 * `--host` - Docker host address
 * `--tls` - use TLS connecting to Docker
 * `--tls-verify` - do TLS verification
@@ -198,7 +201,8 @@ Global options:
 * `--http-probe` - enables HTTP probing (disabled by default)
 * `--http-probe-cmd` - additional HTTP probe command [zero or more]
 * `--http-probe-cmd-file` - file with user defined HTTP probe commands
-* `--show-clogs` - show container logs (stdout and stderr)
+* `--show-clogs` - show container logs (from the container used to perform dynamic inspection)
+* `--show-blogs` - show build logs (when the minified container is built)
 * `--remove-file-artifacts` - remove file artifacts when command is done (note: you'll loose autogenerated Seccomp and Apparmor profiles)
 * `--tag` - use a custom tag for the generated image (instead of the default: `<original_image_name>.slim`)
 * `--entrypoint` - override ENTRYPOINT analyzing image
@@ -304,7 +308,7 @@ It's used to minify the `container-transform` tool. You can get the minified ima
 
 ## CURRENT STATE
 
-It works pretty well with the sample Node.js, Python (2 and 3), Ruby, Java and Golang images (built from `examples/apps`). More testing needs to be done to see how it works with other images. Rails/unicorn app images are not fully supported yet (WIP).
+It works pretty well with the sample Node.js, Python (2 and 3), Ruby, Java and Golang images (built from `examples/apps`). PHP support is WIP. There's already one PHP example, but more needs to be done to support Apache and Nginx based PHP apps. More testing needs to be done to see how it works with other images. Rails/unicorn app images are not fully supported yet (WIP).
 
 Sample images (built with the standard Ubuntu 14.04 base image):
 
@@ -324,6 +328,10 @@ Sample Golang application images:
 * from ubuntu:14.04:  529MB => 1.86MB
 * from golang:alpine: 258MB => 1.55MB
 
+Sample PHP application images:
+
+* from php:7.0-cli: 368MB => 26.6MB
+
 You can also run `docker-slim` in the `info` mode and it'll generate useful image information including a "reverse engineered" Dockerfile.
 
 DockerSlim now also generates Seccomp (usable) and AppArmor (WIP) profiles for your container.

examples/apps/php_web_standard/slim_debug.command

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+here="$(dirname "$BASH_SOURCE")"
+cd $here
+docker-slim --debug build --http-probe --show-clogs --show-blogs my/php-web-app

examples/apps/php_web_standard/slim_verbose.command

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+here="$(dirname "$BASH_SOURCE")"
+cd $here
+docker-slim --verbose build --http-probe --show-blogs my/php-web-app

internal/app/master/builder/image_builder.go

@@ -1,7 +1,8 @@
 package builder
 
 import (
-	"os"
+	//"os"
+	"bytes"
 	"path/filepath"
 
 	"github.com/docker-slim/docker-slim/internal/app/master/config"
@@ -14,49 +15,56 @@ import (
 
 // ImageBuilder creates new container images
 type ImageBuilder struct {
-	RepoName     string
-	ID           string
-	Entrypoint   []string
-	Cmd          []string
-	WorkingDir   string
-	Env          []string
-	ExposedPorts map[docker.Port]struct{}
-	Volumes      map[string]struct{}
-	OnBuild      []string
-	User         string
-	HasData      bool
-	BuildOptions docker.BuildImageOptions
-	APIClient    *docker.Client
+	ShowBuildLogs bool
+	RepoName      string
+	ID            string
+	Entrypoint    []string
+	Cmd           []string
+	WorkingDir    string
+	Env           []string
+	ExposedPorts  map[docker.Port]struct{}
+	Volumes       map[string]struct{}
+	OnBuild       []string
+	User          string
+	HasData       bool
+	BuildOptions  docker.BuildImageOptions
+	APIClient     *docker.Client
+	BuildLog      bytes.Buffer
 }
 
 // NewImageBuilder creates a new ImageBuilder instances
 func NewImageBuilder(client *docker.Client,
 	imageRepoName string,
 	imageInfo *docker.Image,
 	artifactLocation string,
+	showBuildLogs bool,
 	imageOverrides map[string]bool,
 	overrides *config.ContainerOverrides) (*ImageBuilder, error) {
 	builder := &ImageBuilder{
-		RepoName:     imageRepoName,
-		ID:           imageInfo.ID,
-		Entrypoint:   imageInfo.Config.Entrypoint,
-		Cmd:          imageInfo.Config.Cmd,
-		WorkingDir:   imageInfo.Config.WorkingDir,
-		Env:          imageInfo.Config.Env,
-		ExposedPorts: imageInfo.Config.ExposedPorts,
-		Volumes:      imageInfo.Config.Volumes,
-		OnBuild:      imageInfo.Config.OnBuild,
-		User:         imageInfo.Config.User,
+		ShowBuildLogs: showBuildLogs,
+		RepoName:      imageRepoName,
+		ID:            imageInfo.ID,
+		Entrypoint:    imageInfo.Config.Entrypoint,
+		Cmd:           imageInfo.Config.Cmd,
+		WorkingDir:    imageInfo.Config.WorkingDir,
+		Env:           imageInfo.Config.Env,
+		ExposedPorts:  imageInfo.Config.ExposedPorts,
+		Volumes:       imageInfo.Config.Volumes,
+		OnBuild:       imageInfo.Config.OnBuild,
+		User:          imageInfo.Config.User,
 		BuildOptions: docker.BuildImageOptions{
 			Name:           imageRepoName,
 			RmTmpContainer: true,
 			ContextDir:     artifactLocation,
 			Dockerfile:     "Dockerfile",
-			OutputStream:   os.Stdout,
+			//SuppressOutput: true,
+			//OutputStream:   os.Stdout,
 		},
 		APIClient: client,
 	}
 
+	builder.BuildOptions.OutputStream = &builder.BuildLog
+
 	dataDir := filepath.Join(artifactLocation, "files")
 	builder.HasData = fsutils.IsDir(dataDir)
 

internal/app/master/cli.go

@@ -37,6 +37,15 @@ func init() {
 			Name:  "debug",
 			Usage: "enable debug logs",
 		},
+		cli.BoolFlag{
+			Name:  "verbose",
+			Usage: "enable info logs",
+		},
+		cli.StringFlag{
+			Name:  "log-level",
+			Value: "warn",
+			Usage: "set the logging level ('debug', 'info', 'warn' (default), 'error', 'fatal', 'panic')",
+		},
 		cli.StringFlag{
 			Name:  "log",
 			Usage: "log file to store logs",
@@ -74,20 +83,49 @@ func init() {
 	app.Before = func(ctx *cli.Context) error {
 		if ctx.GlobalBool("debug") {
 			log.SetLevel(log.DebugLevel)
+		} else {
+			if ctx.GlobalBool("verbose") {
+				log.SetLevel(log.InfoLevel)
+			} else {
+				logLevel := log.WarnLevel
+				logLevelName := ctx.GlobalString("log-level")
+				switch logLevelName {
+				case "debug":
+					logLevel = log.DebugLevel
+				case "info":
+					logLevel = log.InfoLevel
+				case "warn":
+					logLevel = log.WarnLevel
+				case "error":
+					logLevel = log.ErrorLevel
+				case "fatal":
+					logLevel = log.FatalLevel
+				case "panic":
+					logLevel = log.PanicLevel
+				default:
+					log.Fatalf("unknown log-level %q", logLevelName)
+				}
+
+				log.SetLevel(logLevel)
+			}
 		}
+
 		if path := ctx.GlobalString("log"); path != "" {
 			f, err := os.Create(path)
 			if err != nil {
 				return err
 			}
 			log.SetOutput(f)
 		}
-		switch ctx.GlobalString("log-format") {
+
+		logFormat := ctx.GlobalString("log-format")
+		switch logFormat {
 		case "text":
+			log.SetFormatter(&log.TextFormatter{DisableColors: true})
 		case "json":
 			log.SetFormatter(new(log.JSONFormatter))
 		default:
-			log.Fatalf("unknown log-format %q", ctx.GlobalString("log-format"))
+			log.Fatalf("unknown log-format %q", logFormat)
 		}
 		return nil
 	}
@@ -118,6 +156,12 @@ func init() {
 		EnvVar: "DSLIM_SHOW_CLOGS",
 	}
 
+	doShowBuildLogsFlag := cli.BoolFlag{
+		Name:   "show-blogs",
+		Usage:  "Show build logs",
+		EnvVar: "DSLIM_SHOW_BLOGS",
+	}
+
 	doUseEntrypointFlag := cli.StringFlag{
 		Name:   "entrypoint",
 		Value:  "",
@@ -227,6 +271,7 @@ func init() {
 				doHTTPProbeCmdFlag,
 				doHTTPProbeCmdFileFlag,
 				doShowContainerLogsFlag,
+				doShowBuildLogsFlag,
 				cli.BoolFlag{
 					Name:   "remove-file-artifacts, r",
 					Usage:  "remove file artifacts when command is done",
@@ -281,6 +326,7 @@ func init() {
 				}
 
 				doShowContainerLogs := ctx.Bool("show-clogs")
+				doShowBuildLogs := ctx.Bool("show-blogs")
 				doTag := ctx.String("tag")
 
 				doImageOverrides := ctx.String("image-overrides")
@@ -322,12 +368,18 @@ func init() {
 				commands.OnBuild(ctx.GlobalBool("debug"),
 					statePath,
 					clientConfig,
-					imageRef, doTag,
-					doHTTPProbe, httpProbeCmds,
-					doRmFileArtifacts, doShowContainerLogs,
+					imageRef,
+					doTag,
+					doHTTPProbe,
+					httpProbeCmds,
+					doRmFileArtifacts,
+					doShowContainerLogs,
+					doShowBuildLogs,
 					parseImageOverrides(doImageOverrides),
 					overrides,
-					volumeMounts, excludePaths, includePaths,
+					volumeMounts,
+					excludePaths,
+					includePaths,
 					confinueAfter)
 
 				return nil