opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-23 13:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump Buildah to v1.15.0

Browse Source 
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
This commit is contained in:
TomSweeneyRedHat
2020-06-17 15:32:12 -04:00
parent fd184fa4a1
commit fde8040faa
13 changed files with 258 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vendor/github.com/openshift/imagebuilder/builder.go generated vendored
View File

@ -332,10 +332,19 @@ func ParseFile(path string) (*parser.Node, error) {
// Step creates a new step from the current state.
func (b *Builder) Step() *Step {
dst := make([]string, len(b.Env)+len(b.RunConfig.Env))
copy(dst, b.Env)
argsMap := make(map[string]string)
for _, argsVal := range b.Arguments() {
val := strings.Split(argsVal, "=")
if len(val) > 1 {
argsMap[val[0]] = val[1]
}
}
userArgs := makeUserArgs(b.Env, argsMap)
dst := make([]string, len(userArgs)+len(b.RunConfig.Env))
copy(dst, userArgs)
dst = append(dst, b.RunConfig.Env...)
dst = append(dst, b.Arguments()...)
return &Step{Env: dst}
}