aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-12-18 13:02:39 -0800
committerGitHub <noreply@github.com>2018-12-18 13:02:39 -0800
commitc8eaf59d5f4bec249db8134c6a9fcfbcac792519 (patch)
tree45f7baaad8054c9c90257f6811112a21589695dc /cmd/podman
parent9b6a70f6c9680ab72f8a5d0685b4bd68222c780c (diff)
parent59635cd1863a7da7a198e14c4d48464eef15aa00 (diff)
downloadpodman-c8eaf59d5f4bec249db8134c6a9fcfbcac792519.tar.gz
podman-c8eaf59d5f4bec249db8134c6a9fcfbcac792519.tar.bz2
podman-c8eaf59d5f4bec249db8134c6a9fcfbcac792519.zip
Merge pull request #2021 from rhatdan/restart
Add information on --restart
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/common.go4
-rw-r--r--cmd/podman/create.go4
2 files changed, 8 insertions, 0 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index c4016698a..8404a29b8 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -422,6 +422,10 @@ var createFlags = []cli.Flag{
Name: "read-only",
Usage: "Make containers root filesystem read-only",
},
+ cli.StringFlag{
+ Name: "restart",
+ Usage: "Restart is not supported. Please use a systemd unit file for restart",
+ },
cli.BoolFlag{
Name: "rm",
Usage: "Remove container (and pod if created) after exit",
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 6c6bcfb41..870eb28d6 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -412,6 +412,10 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim
blkioWeight uint16
namespaces map[string]string
)
+ if c.IsSet("restart") {
+ return nil, errors.Errorf("--restart option is not supported.\nUse systemd unit files for restarting containers")
+ }
+
idmappings, err := util.ParseIDMapping(c.StringSlice("uidmap"), c.StringSlice("gidmap"), c.String("subuidname"), c.String("subgidname"))
if err != nil {
return nil, err