summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-28 16:23:48 +0200
committerGitHub <noreply@github.com>2019-05-28 16:23:48 +0200
commit335a1ef1606734e4735a810e839032297cc89060 (patch)
tree12cfd0200888ced920a4144e57bfb8abf65aee68 /cmd/podman
parent25f8c21ea8ac1994cd1e8468c72e3d3481be8102 (diff)
parent1910118de988c8698a2d6a6eaf666dc958e454fe (diff)
downloadpodman-335a1ef1606734e4735a810e839032297cc89060.tar.gz
podman-335a1ef1606734e4735a810e839032297cc89060.tar.bz2
podman-335a1ef1606734e4735a810e839032297cc89060.zip
Merge pull request #3189 from vrothberg/apparmor-fixes
Apparmor fixes
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/create.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index cb3ba14c5..2351f5860 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -7,6 +7,7 @@ import (
"github.com/containers/libpod/pkg/adapter"
"github.com/opentracing/opentracing-go"
"github.com/pkg/errors"
+ "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@@ -72,6 +73,10 @@ func createInit(c *cliconfig.PodmanCommand) error {
defer span.Finish()
}
+ if c.IsSet("privileged") && c.IsSet("security-opt") {
+ logrus.Warn("setting security options with --privileged has no effect")
+ }
+
// Docker-compatibility: the "-h" flag for run/create is reserved for
// the hostname (see https://github.com/containers/libpod/issues/1367).