diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-02-04 09:44:39 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-02-04 09:44:39 -0500 |
| commit | e47a3bec91f65a47a7455f3d970b4ba443565663 (patch) | |
| tree | c33349bcd36ce3a6ec8902f5c753d91d77873d8e /vendor/github.com/openshift/imagebuilder/builder.go | |
| parent | 4ad9e0030bc20826f735cf4ec0d5ecc287647218 (diff) | |
| download | podman-e47a3bec91f65a47a7455f3d970b4ba443565663.tar.gz podman-e47a3bec91f65a47a7455f3d970b4ba443565663.tar.bz2 podman-e47a3bec91f65a47a7455f3d970b4ba443565663.zip | |
Vendor in containers/buildah v1.24.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/openshift/imagebuilder/builder.go')
| -rw-r--r-- | vendor/github.com/openshift/imagebuilder/builder.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/github.com/openshift/imagebuilder/builder.go b/vendor/github.com/openshift/imagebuilder/builder.go index df5269904..b0e9d4f51 100644 --- a/vendor/github.com/openshift/imagebuilder/builder.go +++ b/vendor/github.com/openshift/imagebuilder/builder.go @@ -303,6 +303,9 @@ type Builder struct { PendingCopies []Copy Warnings []string + // Raw platform string specified with `FROM --platform` of the stage + // It's up to the implementation or client to parse and use this field + Platform string } func NewBuilder(args map[string]string) *Builder { @@ -470,7 +473,7 @@ func (b *Builder) FromImage(image *docker.Image, node *parser.Node) error { b.RunConfig.Env = nil // Check to see if we have a default PATH, note that windows won't - // have one as its set by HCS + // have one as it's set by HCS if runtime.GOOS != "windows" && !hasEnvName(b.Env, "PATH") { b.RunConfig.Env = append(b.RunConfig.Env, "PATH="+defaultPathEnv) } |