diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-06 06:21:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 06:21:08 -0400 |
| commit | a7ceed05a0782beecfbfc53bb1f9bfd5c41f859e (patch) | |
| tree | 7474532d808b38979cd314bf86a16f938ae5a846 /vendor | |
| parent | 41ccc045fb492e79d8b6c1bf2dba97b0fa912afa (diff) | |
| parent | a704911061c2205475bf5b252d80fc43a9927a41 (diff) | |
| download | podman-a7ceed05a0782beecfbfc53bb1f9bfd5c41f859e.tar.gz podman-a7ceed05a0782beecfbfc53bb1f9bfd5c41f859e.tar.bz2 podman-a7ceed05a0782beecfbfc53bb1f9bfd5c41f859e.zip | |
Merge pull request #6848 from TomSweeneyRedHat/dev/tsweeney/ib_v1.1.6_up
Bump imagebuilder to v1.1.6 in upstream
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/openshift/imagebuilder/builder.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/openshift/imagebuilder/imagebuilder.spec | 2 | ||||
| -rw-r--r-- | vendor/github.com/openshift/imagebuilder/internals.go | 2 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/vendor/github.com/openshift/imagebuilder/builder.go b/vendor/github.com/openshift/imagebuilder/builder.go index ffc3b257f..583c303c0 100644 --- a/vendor/github.com/openshift/imagebuilder/builder.go +++ b/vendor/github.com/openshift/imagebuilder/builder.go @@ -334,7 +334,7 @@ func ParseFile(path string) (*parser.Node, error) { func (b *Builder) Step() *Step { argsMap := make(map[string]string) for _, argsVal := range b.Arguments() { - val := strings.Split(argsVal, "=") + val := strings.SplitN(argsVal, "=", 2) if len(val) > 1 { argsMap[val[0]] = val[1] } diff --git a/vendor/github.com/openshift/imagebuilder/imagebuilder.spec b/vendor/github.com/openshift/imagebuilder/imagebuilder.spec index 3b32403a7..b8680bd10 100644 --- a/vendor/github.com/openshift/imagebuilder/imagebuilder.spec +++ b/vendor/github.com/openshift/imagebuilder/imagebuilder.spec @@ -12,7 +12,7 @@ # %global golang_version 1.8.1 -%{!?version: %global version 1.1.5} +%{!?version: %global version 1.1.6} %{!?release: %global release 1} %global package_name imagebuilder %global product_name Container Image Builder diff --git a/vendor/github.com/openshift/imagebuilder/internals.go b/vendor/github.com/openshift/imagebuilder/internals.go index b652dc1c7..5dc174bf7 100644 --- a/vendor/github.com/openshift/imagebuilder/internals.go +++ b/vendor/github.com/openshift/imagebuilder/internals.go @@ -103,7 +103,7 @@ func makeUserArgs(bEnv []string, bArgs map[string]string) (userArgs []string) { userArgs = bEnv envMap := make(map[string]string) for _, envVal := range bEnv { - val := strings.Split(envVal, "=") + val := strings.SplitN(envVal, "=", 2) if len(val) > 1 { envMap[val[0]] = val[1] } diff --git a/vendor/modules.txt b/vendor/modules.txt index 3d305eba8..64d9a3a18 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -431,7 +431,7 @@ github.com/opencontainers/runtime-tools/validate github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label github.com/opencontainers/selinux/pkg/pwalk -# github.com/openshift/imagebuilder v1.1.5 +# github.com/openshift/imagebuilder v1.1.6 github.com/openshift/imagebuilder github.com/openshift/imagebuilder/dockerfile/command github.com/openshift/imagebuilder/dockerfile/parser |