diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-31 09:43:44 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-04-16 13:28:59 -0400 |
| commit | 0d049e93a434e24fed8e0725c908e3a25cabb33b (patch) | |
| tree | 24fdbb3e3e40756cdde156551cd4b3629cd02936 | |
| parent | ea0e530050988e76b63861b14536fb0f638ae496 (diff) | |
| download | podman-0d049e93a434e24fed8e0725c908e3a25cabb33b.tar.gz podman-0d049e93a434e24fed8e0725c908e3a25cabb33b.tar.bz2 podman-0d049e93a434e24fed8e0725c908e3a25cabb33b.zip | |
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 <dwalsh@redhat.com>
| -rw-r--r-- | libpod/runtime_img.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 13ac42e7d..8f49a18b6 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 |