opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20455 from rhatdan/play

Browse Source 
Use buildah default isolation when working with podman play kube
This commit is contained in:
openshift-ci[bot]
2023-10-24 18:29:23 +00:00
committed by GitHub
parent e9e18acd5f 06b7264977
commit 35121f67bf
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/markdown/podman-kube-play.1.md.in
View File

@ -163,6 +163,8 @@ and as a result environment variable `FOO` is set to `bar` for container `contai
Build images even if they are found in the local storage. Use `--build=false` to completely disable builds. (This option is not available with the remote Podman client) Build images even if they are found in the local storage. Use `--build=false` to completely disable builds. (This option is not available with the remote Podman client)
Note: You can also override the default isolation type by setting the BUILDAH_ISOLATION environment variable. export BUILDAH_ISOLATION=oci. See podman-build.1.md for more information.
@@option cert-dir @@option cert-dir
#### **--configmap**=*path* #### **--configmap**=*path*
@ -320,4 +322,4 @@ has been changed or altered.
@@include ../../kubernetes_support.md @@include ../../kubernetes_support.md
## SEE ALSO ## SEE ALSO
**[podman(1)](podman.1.md)**, **[podman-kube(1)](podman-kube.1.md)**, **[podman-kube-down(1)](podman-kube-down.1.md)**, **[podman-network-create(1)](podman-network-create.1.md)**, **[podman-kube-generate(1)](podman-kube-generate.1.md)**, **[containers-certs.d(5)](https://github.com/containers/image/blob/main/docs/containers-certs.d.5.md)** **[podman(1)](podman.1.md)**, **[podman-kube(1)](podman-kube.1.md)**, **[podman-kube-down(1)](podman-kube-down.1.md)**, **[podman-network-create(1)](podman-network-create.1.md)**, **[podman-kube-generate(1)](podman-kube-generate.1.md)**, **[podman-build(1)](podman-build.1.md)**, **[containers-certs.d(5)](https://github.com/containers/image/blob/main/docs/containers-certs.d.5.md)**

7
pkg/domain/infra/abi/play.go
View File

@ -13,6 +13,7 @@ import (
"sync" "sync"
buildahDefine "github.com/containers/buildah/define" buildahDefine "github.com/containers/buildah/define"
bparse "github.com/containers/buildah/pkg/parse"
"github.com/containers/common/libimage" "github.com/containers/common/libimage"
nettypes "github.com/containers/common/libnetwork/types" nettypes "github.com/containers/common/libnetwork/types"
"github.com/containers/common/pkg/config" "github.com/containers/common/pkg/config"
@ -991,7 +992,11 @@ func (ic *ContainerEngine) getImageAndLabelInfo(ctx context.Context, cwd string,
buildOpts := new(buildahDefine.BuildOptions) buildOpts := new(buildahDefine.BuildOptions)
commonOpts := new(buildahDefine.CommonBuildOptions) commonOpts := new(buildahDefine.CommonBuildOptions)
buildOpts.ConfigureNetwork = buildahDefine.NetworkDefault buildOpts.ConfigureNetwork = buildahDefine.NetworkDefault
buildOpts.Isolation = buildahDefine.IsolationChroot isolation, err := bparse.IsolationOption("")
if err != nil {
return nil, nil, err
}
buildOpts.Isolation = isolation
buildOpts.CommonBuildOpts = commonOpts buildOpts.CommonBuildOpts = commonOpts
buildOpts.Output = container.Image buildOpts.Output = container.Image
buildOpts.ContextDirectory = filepath.Dir(buildFile) buildOpts.ContextDirectory = filepath.Dir(buildFile)