From 0d049e93a434e24fed8e0725c908e3a25cabb33b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 31 Mar 2021 09:43:44 -0400 Subject: [PATCH] Should send the OCI runtime path not just the name to buildah [NO TESTS NEEDED] Mainly because I have no idea how we would test this. Fixes: https://github.com/containers/podman/issues/9459 Signed-off-by: Daniel J Walsh --- libpod/runtime_img.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 13ac42e7d8..8f49a18b64 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -167,9 +167,7 @@ func (r *Runtime) newImageBuildCompleteEvent(idOrName string) { // Build adds the runtime to the imagebuildah call func (r *Runtime) Build(ctx context.Context, options imagebuildah.BuildOptions, dockerfiles ...string) (string, reference.Canonical, error) { if options.Runtime == "" { - // Make sure that build containers use the same runtime as Podman (see #9365). - conf := util.DefaultContainerConfig() - options.Runtime = conf.Engine.OCIRuntime + options.Runtime = r.GetOCIRuntimePath() } id, ref, err := imagebuildah.BuildDockerfiles(ctx, r.store, options, dockerfiles...) // Write event for build completion