Merge pull request #3663 from rhatdan/error

Wire logger through to config

buildah.go

@@ -271,6 +271,8 @@ type BuilderOptions struct {
 	// to store copies of layer blobs that we pull down, if any.  It should
 	// already exist.
 	BlobDirectory string
+	// Logger is the logrus logger to write log messages with
+	Logger *logrus.Logger `json:"-"`
 	// Mount signals to NewBuilder() that the container should be mounted
 	// immediately.
 	Mount bool

imagebuildah/stage_executor.go

@@ -558,6 +558,7 @@ func (s *StageExecutor) prepare(ctx context.Context, from string, initializeIBCo
 		MaxPullRetries:        s.executor.maxPullPushRetries,
 		PullRetryDelay:        s.executor.retryPullPushDelay,
 		OciDecryptConfig:      s.executor.ociDecryptConfig,
+		Logger:                s.executor.logger,
 	}
 
 	builder, err = buildah.NewBuilder(ctx, s.executor.store, builderOptions)

new.go

@@ -290,6 +290,7 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
 		Format:          options.Format,
 		TempVolumes:     map[string]bool{},
 		Devices:         options.Devices,
+		Logger:          options.Logger,
 	}
 
 	if options.Mount {