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

Do not log information about empty sections

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-05-09 13:10:19 +01:00
parent e25033f70d
commit 96ae98d2d5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/moby/build.go
View File

@ -159,7 +159,9 @@ func buildInternal(m *Moby, name string, pull bool) []byte {
} }
// convert init images to tarballs // convert init images to tarballs
if len(m.Init) != 0 {
log.Infof("Add init containers:") log.Infof("Add init containers:")
}
for _, ii := range m.Init { for _, ii := range m.Init {
log.Infof("Process init image: %s", ii) log.Infof("Process init image: %s", ii)
init, err := ImageExtract(ii, "", enforceContentTrust(ii, &m.Trust), pull) init, err := ImageExtract(ii, "", enforceContentTrust(ii, &m.Trust), pull)
@ -170,7 +172,9 @@ func buildInternal(m *Moby, name string, pull bool) []byte {
initrdAppend(iw, buffer) initrdAppend(iw, buffer)
} }
if len(m.Onboot) != 0 {
log.Infof("Add onboot containers:") log.Infof("Add onboot containers:")
}
for i, image := range m.Onboot { for i, image := range m.Onboot {
log.Infof(" Create OCI config for %s", image.Image) log.Infof(" Create OCI config for %s", image.Image)
config, err := ConfigToOCI(&image) config, err := ConfigToOCI(&image)
@ -187,7 +191,9 @@ func buildInternal(m *Moby, name string, pull bool) []byte {
initrdAppend(iw, buffer) initrdAppend(iw, buffer)
} }
if len(m.Services) != 0 {
log.Infof("Add service containers:") log.Infof("Add service containers:")
}
for _, image := range m.Services { for _, image := range m.Services {
log.Infof(" Create OCI config for %s", image.Image) log.Infof(" Create OCI config for %s", image.Image)
config, err := ConfigToOCI(&image) config, err := ConfigToOCI(&image)

2
cmd/moby/config.go
View File

@ -430,7 +430,9 @@ func filesystem(m *Moby) (*bytes.Buffer, error) {
tw := tar.NewWriter(buf) tw := tar.NewWriter(buf)
defer tw.Close() defer tw.Close()
if len(m.Files) != 0 {
log.Infof("Add files:") log.Infof("Add files:")
}
for _, f := range m.Files { for _, f := range m.Files {
log.Infof(" %s", f.Path) log.Infof(" %s", f.Path)
if f.Path == "" { if f.Path == "" {