diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-01 03:10:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-01 03:10:24 +0200 |
| commit | 12881abc065afda5bf979accfead542d411f48d6 (patch) | |
| tree | 1f63e88c40ba9ce454e71f88783a74326a9eff59 | |
| parent | 5798102679cc6e7def72c33f1a6ec0782ff195ee (diff) | |
| parent | 37d1bc429896d648998d3256dc6faf768dc1c485 (diff) | |
| download | podman-12881abc065afda5bf979accfead542d411f48d6.tar.gz podman-12881abc065afda5bf979accfead542d411f48d6.tar.bz2 podman-12881abc065afda5bf979accfead542d411f48d6.zip | |
Merge pull request #9906 from rhatdan/runtime
Should send the OCI runtime path not just the name to buildah
| -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 |