diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-03 11:30:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 11:30:51 +0200 |
| commit | a7809fabe508e26c527490e700a1703ef923bd3b (patch) | |
| tree | 2c3e83fa62f6b98b394123d1c73e321e40041c95 /cmd/podman/shared/container.go | |
| parent | 4877e6a947beff12f7f927978f04cffc11377007 (diff) | |
| parent | a477a8ff755e2807d0745b207d6a5bf57de58e4c (diff) | |
| download | podman-a7809fabe508e26c527490e700a1703ef923bd3b.tar.gz podman-a7809fabe508e26c527490e700a1703ef923bd3b.tar.bz2 podman-a7809fabe508e26c527490e700a1703ef923bd3b.zip | |
Merge pull request #2905 from QiWang19/globalvar
Add variable for global flags to runlabel
Diffstat (limited to 'cmd/podman/shared/container.go')
| -rw-r--r-- | cmd/podman/shared/container.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index 9050fd2b9..fe447d10d 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -883,7 +883,7 @@ func GetRunlabel(label string, runlabelImage string, ctx context.Context, runtim } // GenerateRunlabelCommand generates the command that will eventually be execucted by podman -func GenerateRunlabelCommand(runLabel, imageName, name string, opts map[string]string, extraArgs []string) ([]string, []string, error) { +func GenerateRunlabelCommand(runLabel, imageName, name string, opts map[string]string, extraArgs []string, globalOpts string) ([]string, []string, error) { // If no name is provided, we use the image's basename instead if name == "" { baseName, err := image.GetImageBaseName(imageName) @@ -896,7 +896,7 @@ func GenerateRunlabelCommand(runLabel, imageName, name string, opts map[string]s if len(extraArgs) > 0 { runLabel = fmt.Sprintf("%s %s", runLabel, strings.Join(extraArgs, " ")) } - cmd, err := GenerateCommand(runLabel, imageName, name) + cmd, err := GenerateCommand(runLabel, imageName, name, globalOpts) if err != nil { return nil, nil, errors.Wrapf(err, "unable to generate command") } |