opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 02:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9368 from vrothberg/fix-9365

Browse Source 
podman build: pass runtime to buildah
This commit is contained in:
OpenShift Merge Robot
2021-02-16 08:53:27 -05:00
committed by GitHub
parent 0a6b76eba1 2845f7b832
commit 6639b218a2
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/runtime_img.go
View File

@ -166,6 +166,11 @@ 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
}
id, ref, err := imagebuildah.BuildDockerfiles(ctx, r.store, options, dockerfiles...)
// Write event for build completion
r.newImageBuildCompleteEvent(id)