diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-04 08:53:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-04 08:53:42 -0500 |
| commit | 320e2935c8468b21a3ce6dee1b5201c2ed3f738a (patch) | |
| tree | fd4078e58bc9ab0b6c2ef1938017ce5844f97744 /vendor/github.com/openshift/imagebuilder/builder.go | |
| parent | 608b6142edb7a4e179ce6d2ae69707be28f29359 (diff) | |
| parent | 1d1b2b1509646e07ab4a984c7622fa002a0fcdb7 (diff) | |
| download | podman-320e2935c8468b21a3ce6dee1b5201c2ed3f738a.tar.gz podman-320e2935c8468b21a3ce6dee1b5201c2ed3f738a.tar.bz2 podman-320e2935c8468b21a3ce6dee1b5201c2ed3f738a.zip | |
Merge pull request #13136 from rhatdan/VENDOR
Update containers/buildah v1.24.1
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) } |