diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-21 15:33:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-21 15:33:39 -0500 |
| commit | a746a61a171d514947dbd4db88541e3702647f2d (patch) | |
| tree | e06d4071d59ec0dc73b12a37fd4626b7209af6b1 /pkg | |
| parent | c3a9505232d88a6133b5c65de008d6a30099ea55 (diff) | |
| parent | 9ce61e3a4911ad89151788539f10d96f69362bc3 (diff) | |
| download | podman-a746a61a171d514947dbd4db88541e3702647f2d.tar.gz podman-a746a61a171d514947dbd4db88541e3702647f2d.tar.bz2 podman-a746a61a171d514947dbd4db88541e3702647f2d.zip | |
Merge pull request #13286 from flouthoc/kube-build-false-default
kube: honor `--build=false` if specified.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/entities/play.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/entities/play.go b/pkg/domain/entities/play.go index 39234caf8..43fa3a712 100644 --- a/pkg/domain/entities/play.go +++ b/pkg/domain/entities/play.go @@ -11,7 +11,7 @@ type PlayKubeOptions struct { // Authfile - path to an authentication file. Authfile string // Indicator to build all images with Containerfile or Dockerfile - Build bool + Build types.OptionalBool // CertDir - to a directory containing TLS certifications and keys. CertDir string // Down indicates whether to bring contents of a yaml file "down" diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index cad8c4609..b8ca591bb 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -486,7 +486,7 @@ func (ic *ContainerEngine) getImageAndLabelInfo(ctx context.Context, cwd string, if err != nil { return nil, nil, err } - if (len(buildFile) > 0 && !existsLocally) || (len(buildFile) > 0 && options.Build) { + if (len(buildFile) > 0) && ((!existsLocally && options.Build != types.OptionalBoolFalse) || (options.Build == types.OptionalBoolTrue)) { buildOpts := new(buildahDefine.BuildOptions) commonOpts := new(buildahDefine.CommonBuildOptions) buildOpts.ConfigureNetwork = buildahDefine.NetworkDefault |