diff options
| author | Aditya R <arajan@redhat.com> | 2022-02-18 16:54:18 +0530 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2022-02-23 14:30:25 -0500 |
| commit | 82f4760deaf57d54ec8476c1d4f5749c1ec3f82b (patch) | |
| tree | c2a0e2f5dc8217bd994889e9372775ce1377c8e8 /pkg | |
| parent | e356dfe06b7a1a0f28815c9a1d591f7886570d2f (diff) | |
| download | podman-82f4760deaf57d54ec8476c1d4f5749c1ec3f82b.tar.gz podman-82f4760deaf57d54ec8476c1d4f5749c1ec3f82b.tar.bz2 podman-82f4760deaf57d54ec8476c1d4f5749c1ec3f82b.zip | |
kube: honor --build=false and make --build=true by default
`podman play kube` tries to build images even if `--build` is set to
false so lets honor that and make `--build` , `true` by default so it
matches the original behviour.
Signed-off-by: Aditya R <arajan@redhat.com>
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 86a60e92d..308a1d0ee 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -476,7 +476,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 |