diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-23 16:43:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 16:43:02 -0500 |
| commit | 49d511b6ee88ceff70cc6786c467bed39da35a61 (patch) | |
| tree | 3e0556416de59ee73fadde87f93a450b83199c86 /pkg/domain | |
| parent | 172b745d0e796327cc23c19e61973365bb1488ef (diff) | |
| parent | cfcc0d6398b2bbddace991ba36d92c631f2b5f45 (diff) | |
| download | podman-49d511b6ee88ceff70cc6786c467bed39da35a61.tar.gz podman-49d511b6ee88ceff70cc6786c467bed39da35a61.tar.bz2 podman-49d511b6ee88ceff70cc6786c467bed39da35a61.zip | |
Merge pull request #13329 from mheon/bump_401
Bump to v4.0.1
Diffstat (limited to 'pkg/domain')
| -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 |