Wire logger through to config

Currently we are only wiring the logger into run_linux.go Not into the Config section. This PR is needed in order to update vendor in Podman. containers/podman#12375 [NO NEW TESTS NEEDED] Tests will be done in Podman. Signed-off-by: Daniel J Walsh <[email protected]>
rhatdan · Dec 3, 2021 · 5b1b0d2 · 5b1b0d2
1 parent 6d01253
commit 5b1b0d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/buildah.go b/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

diff --git a/imagebuildah/stage_executor.go b/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)

diff --git a/new.go b/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 {