Skip to content

Commit

Permalink
Merge pull request #9906 from rhatdan/runtime
Browse files Browse the repository at this point in the history
Should send the OCI runtime path not just the name to buildah
  • Loading branch information
openshift-merge-robot authored Apr 1, 2021
2 parents 5798102 + 37d1bc4 commit 12881ab
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions libpod/runtime_img.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 12881ab

Please sign in to comment.