containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Daniel J Walsh 2021-03-31 09:43:44 -04:00
parent dbb7009e55
commit 37d1bc4298
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/runtime_img.go
View File

@ -168,9 +168,7 @@ func (r *Runtime) newImageBuildCompleteEvent(idOrName string) {
// Build adds the runtime to the imagebuildah call // Build adds the runtime to the imagebuildah call
func (r *Runtime) Build(ctx context.Context, options buildahDefine.BuildOptions, dockerfiles ...string) (string, reference.Canonical, error) { func (r *Runtime) Build(ctx context.Context, options buildahDefine.BuildOptions, dockerfiles ...string) (string, reference.Canonical, error) {
if options.Runtime == "" { if options.Runtime == "" {
// Make sure that build containers use the same runtime as Podman (see #9365). options.Runtime = r.GetOCIRuntimePath()
conf := util.DefaultContainerConfig()
options.Runtime = conf.Engine.OCIRuntime
} }
id, ref, err := imagebuildah.BuildDockerfiles(ctx, r.store, options, dockerfiles...) id, ref, err := imagebuildah.BuildDockerfiles(ctx, r.store, options, dockerfiles...)
// Write event for build completion // Write event for build completion