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

Merge pull request #6848 from TomSweeneyRedHat/dev/tsweeney/ib_v1.1.6_up

Browse Source 
Bump imagebuilder to v1.1.6 in upstream
This commit is contained in:
OpenShift Merge Robot
2020-07-06 06:21:08 -04:00
committed by GitHub
parent 41ccc045fb a704911061
commit a7ceed05a0
6 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -43,6 +43,7 @@ require (
github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2 github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2
github.com/opencontainers/runtime-tools v0.9.0 github.com/opencontainers/runtime-tools v0.9.0
github.com/opencontainers/selinux v1.5.2 github.com/opencontainers/selinux v1.5.2
github.com/openshift/imagebuilder v1.1.6 // indirect
github.com/opentracing/opentracing-go v1.2.0 github.com/opentracing/opentracing-go v1.2.0
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib v1.0.0

2
go.sum
View File

@ -342,6 +342,8 @@ github.com/opencontainers/selinux v1.5.2 h1:F6DgIsjgBIcDksLW4D5RG9bXok6oqZ3nvMwj
github.com/opencontainers/selinux v1.5.2/go.mod h1:yTcKuYAh6R95iDpefGLQaPaRwJFwyzAJufJyiTt7s0g= github.com/opencontainers/selinux v1.5.2/go.mod h1:yTcKuYAh6R95iDpefGLQaPaRwJFwyzAJufJyiTt7s0g=
github.com/openshift/imagebuilder v1.1.5 h1:WAIHV6cGF9e0AcLBA7RIi7XbFoB7R+e/MWu1I+1NUOM= github.com/openshift/imagebuilder v1.1.5 h1:WAIHV6cGF9e0AcLBA7RIi7XbFoB7R+e/MWu1I+1NUOM=
github.com/openshift/imagebuilder v1.1.5/go.mod h1:9aJRczxCH0mvT6XQ+5STAQaPWz7OsWcU5/mRkt8IWeo= github.com/openshift/imagebuilder v1.1.5/go.mod h1:9aJRczxCH0mvT6XQ+5STAQaPWz7OsWcU5/mRkt8IWeo=
github.com/openshift/imagebuilder v1.1.6 h1:1+YzRxIIefY4QqtCImx6rg+75QrKNfBoPAKxgMo/khM=
github.com/openshift/imagebuilder v1.1.6/go.mod h1:9aJRczxCH0mvT6XQ+5STAQaPWz7OsWcU5/mRkt8IWeo=
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 h1:TnbXhKzrTOyuvWrjI8W6pcoI9XPbLHFXCdN2dtUw7Rw= github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 h1:TnbXhKzrTOyuvWrjI8W6pcoI9XPbLHFXCdN2dtUw7Rw=

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

@ -334,7 +334,7 @@ func ParseFile(path string) (*parser.Node, error) {
func (b *Builder) Step() *Step { func (b *Builder) Step() *Step {
argsMap := make(map[string]string) argsMap := make(map[string]string)
for _, argsVal := range b.Arguments() { for _, argsVal := range b.Arguments() {
val := strings.Split(argsVal, "=") val := strings.SplitN(argsVal, "=", 2)
if len(val) > 1 { if len(val) > 1 {
argsMap[val[0]] = val[1] argsMap[val[0]] = val[1]
} }

2
vendor/github.com/openshift/imagebuilder/imagebuilder.spec generated vendored
View File

@ -12,7 +12,7 @@
# #
%global golang_version 1.8.1 %global golang_version 1.8.1
%{!?version: %global version 1.1.5} %{!?version: %global version 1.1.6}
%{!?release: %global release 1} %{!?release: %global release 1}
%global package_name imagebuilder %global package_name imagebuilder
%global product_name Container Image Builder %global product_name Container Image Builder

2
vendor/github.com/openshift/imagebuilder/internals.go generated vendored
View File

@ -103,7 +103,7 @@ func makeUserArgs(bEnv []string, bArgs map[string]string) (userArgs []string) {
userArgs = bEnv userArgs = bEnv
envMap := make(map[string]string) envMap := make(map[string]string)
for _, envVal := range bEnv { for _, envVal := range bEnv {
val := strings.Split(envVal, "=") val := strings.SplitN(envVal, "=", 2)
if len(val) > 1 { if len(val) > 1 {
envMap[val[0]] = val[1] envMap[val[0]] = val[1]
} }

2
vendor/modules.txt vendored
View File

@ -431,7 +431,7 @@ github.com/opencontainers/runtime-tools/validate
github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux
github.com/opencontainers/selinux/go-selinux/label github.com/opencontainers/selinux/go-selinux/label
github.com/opencontainers/selinux/pkg/pwalk 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
github.com/openshift/imagebuilder/dockerfile/command github.com/openshift/imagebuilder/dockerfile/command
github.com/openshift/imagebuilder/dockerfile/parser github.com/openshift/imagebuilder/dockerfile/parser