github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2694 from rn/debug

Browse Source 
pkglib: Enable runtime debug output
This commit is contained in:
Justin Cormack 2017-11-07 21:27:50 +00:00 committed by GitHub
commit dd6087098b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cmd/linuxkit/pkglib/docker.go
View File

@ -8,9 +8,9 @@ import (
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
)
const debugDockerCommands = false log "github.com/sirupsen/logrus"
)
const dctEnableEnv = "DOCKER_CONTENT_TRUST=1" const dctEnableEnv = "DOCKER_CONTENT_TRUST=1"
@ -36,16 +36,15 @@ func (dr dockerRunner) command(args ...string) error {
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
cmd.Env = os.Environ() cmd.Env = os.Environ()
dct := ""
if dr.dct { if dr.dct {
cmd.Env = append(cmd.Env, dctEnableEnv) cmd.Env = append(cmd.Env, dctEnableEnv)
dct = dctEnableEnv + " "
} }
if debugDockerCommands {
var dct string log.Debugf("Executing: %s%v", dct, cmd.Args)
if dr.dct {
dct = dctEnableEnv + " "
}
fmt.Fprintf(os.Stderr, "+ %s%v\n", dct, cmd.Args)
}
err := cmd.Run() err := cmd.Run()
if isExecErrNotFound(err) { if isExecErrNotFound(err) {
return fmt.Errorf("linuxkit pkg requires docker to be installed") return fmt.Errorf("linuxkit pkg requires docker to be installed")
@ -85,9 +84,8 @@ func (dr dockerRunner) pushWithManifest(img, suffix string) error {
cmd := exec.Command("/bin/sh", "-c", manifestPushScript, "manifest-push-script", img, dctArg) cmd := exec.Command("/bin/sh", "-c", manifestPushScript, "manifest-push-script", img, dctArg)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
if debugDockerCommands { log.Debugf("Executing: %v", cmd.Args)
fmt.Fprintf(os.Stderr, "+ %v\n", cmd.Args)
}
return cmd.Run() return cmd.Run()
} }

13
src/cmd/linuxkit/pkglib/git.go
View File

@ -9,9 +9,9 @@ import (
"os/exec" "os/exec"
"regexp" "regexp"
"strings" "strings"
)
const debugGitCommands = false log "github.com/sirupsen/logrus"
)
// 040000 tree 7804129bd06218b72c298139a25698a748d253c6\tpkg/init // 040000 tree 7804129bd06218b72c298139a25698a748d253c6\tpkg/init
var treeHashRe *regexp.Regexp var treeHashRe *regexp.Regexp
@ -46,10 +46,8 @@ func (g git) mkCmd(args ...string) *exec.Cmd {
func (g git) commandStdout(stderr io.Writer, args ...string) (string, error) { func (g git) commandStdout(stderr io.Writer, args ...string) (string, error) {
cmd := g.mkCmd(args...) cmd := g.mkCmd(args...)
cmd.Stderr = stderr cmd.Stderr = stderr
log.Debugf("Executing: %v", cmd.Args)
if debugGitCommands {
fmt.Fprintf(os.Stderr, "+ %v\n", cmd.Args)
}
out, err := cmd.Output() out, err := cmd.Output()
if err != nil { if err != nil {
return "", err return "", err
@ -61,9 +59,8 @@ func (g git) command(args ...string) error {
cmd := g.mkCmd(args...) cmd := g.mkCmd(args...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
if debugGitCommands { log.Debugf("Executing: %v", cmd.Args)
fmt.Fprintf(os.Stderr, "+ %v\n", cmd.Args)
}
return cmd.Run() return cmd.Run()
} }