diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-31 09:43:44 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-31 09:46:42 -0400 |
| commit | 37d1bc429896d648998d3256dc6faf768dc1c485 (patch) | |
| tree | 0f3a93e4f43bfbc78c5b26d7f33c77c47fcc36f0 | |
| parent | dbb7009e5586d41a5b64806ae5fb664dc77c7bdb (diff) | |
| download | podman-37d1bc429896d648998d3256dc6faf768dc1c485.tar.gz podman-37d1bc429896d648998d3256dc6faf768dc1c485.tar.bz2 podman-37d1bc429896d648998d3256dc6faf768dc1c485.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 b427125db..3588467a5 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -168,9 +168,7 @@ func (r *Runtime) newImageBuildCompleteEvent(idOrName string) { // Build adds the runtime to the imagebuildah call func (r *Runtime) Build(ctx context.Context, options buildahDefine.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 |