summaryrefslogtreecommitdiff
path: root/pkg/domain
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-12-08 09:40:29 +0100
committerValentin Rothberg <rothberg@redhat.com>2021-12-08 11:37:13 +0100
commitd7f6f4e8819cca1f5d14194ec685596c198855cf (patch)
tree2a1a34300b81be529768ae39c317d375614c7824 /pkg/domain
parent23ce826a84db81b834ef62584b6d3ffb3e0084fd (diff)
downloadpodman-d7f6f4e8819cca1f5d14194ec685596c198855cf.tar.gz
podman-d7f6f4e8819cca1f5d14194ec685596c198855cf.tar.bz2
podman-d7f6f4e8819cca1f5d14194ec685596c198855cf.zip
remove runlabel test for global opts
GLOBAL_OPTS haven't been supported for at least two major versions of Podman. The runlabel code is extremely fragile and I think it should be rewritten before adding new features. Fixes: #12436 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/domain')
-rw-r--r--pkg/domain/infra/abi/containers_runlabel.go7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go
index b0aae4b76..716e77716 100644
--- a/pkg/domain/infra/abi/containers_runlabel.go
+++ b/pkg/domain/infra/abi/containers_runlabel.go
@@ -111,7 +111,6 @@ func generateRunlabelCommand(runlabel string, img *libimage.Image, inputName str
var (
err error
name, imageName string
- globalOpts string
cmd []string
)
@@ -144,7 +143,7 @@ func generateRunlabelCommand(runlabel string, img *libimage.Image, inputName str
runlabel = fmt.Sprintf("%s %s", runlabel, strings.Join(args, " "))
}
- cmd, err = generateCommand(runlabel, imageName, name, globalOpts)
+ cmd, err = generateCommand(runlabel, imageName, name)
if err != nil {
return nil, nil, err
}
@@ -209,7 +208,7 @@ func replaceImage(arg, image string) string {
}
// generateCommand takes a label (string) and converts it to an executable command
-func generateCommand(command, imageName, name, globalOpts string) ([]string, error) {
+func generateCommand(command, imageName, name string) ([]string, error) {
if name == "" {
name = imageName
}
@@ -231,8 +230,6 @@ func generateCommand(command, imageName, name, globalOpts string) ([]string, err
newArg = fmt.Sprintf("IMAGE=%s", imageName)
case "NAME=NAME":
newArg = fmt.Sprintf("NAME=%s", name)
- case "$GLOBAL_OPTS":
- newArg = globalOpts
default:
newArg = replaceName(arg, name)
newArg = replaceImage(newArg, imageName)