Skip to content

Commit 562e912

Browse files
author
Ma Shimiao
committed
man: add tty option and tfix
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
1 parent 564b30e commit 562e912

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

cmd/ocitools/generate.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ var generateFlags = []cli.Flag{
1313
cli.StringFlag{Name: "output", Usage: "output file (defaults to stdout)"},
1414
cli.StringFlag{Name: "rootfs", Value: "rootfs", Usage: "path to the rootfs"},
1515
cli.BoolFlag{Name: "read-only", Usage: "make the container's rootfs read-only"},
16-
cli.BoolFlag{Name: "privileged", Usage: "enabled privileged container settings"},
16+
cli.BoolFlag{Name: "privileged", Usage: "enable privileged container settings"},
1717
cli.BoolFlag{Name: "no-new-privileges", Usage: "set no new privileges bit for the container process"},
1818
cli.BoolFlag{Name: "tty", Usage: "allocate a new tty for the container process"},
1919
cli.StringFlag{Name: "hostname", Usage: "hostname value for the container"},
2020
cli.IntFlag{Name: "uid", Usage: "uid for the process"},
2121
cli.IntFlag{Name: "gid", Usage: "gid for the process"},
2222
cli.StringSliceFlag{Name: "groups", Usage: "supplementary groups for the process"},
23-
cli.StringSliceFlag{Name: "cap-add", Usage: "add capabilities"},
24-
cli.StringSliceFlag{Name: "cap-drop", Usage: "drop capabilities"},
23+
cli.StringSliceFlag{Name: "cap-add", Usage: "add Linux capabilities"},
24+
cli.StringSliceFlag{Name: "cap-drop", Usage: "drop Linux capabilities"},
2525
cli.StringFlag{Name: "cgroup", Usage: "cgroup namespace"},
2626
cli.StringFlag{Name: "network", Usage: "network namespace"},
2727
cli.StringFlag{Name: "mount", Usage: "mount namespace"},

man/ocitools-generate.1.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ inside of the container.
107107
it is unset, create a new namespace. The special *PATH* `host`
108108
removes any existing network namespace from the configuration.
109109

110-
**--no-new-privileges**
110+
**--no-new-privileges**=true|false
111111
Set no new privileges bit for the container process. Setting this flag
112112
will block the container processes from gaining any additional privileges
113113
using tools like setuid apps. It is a good idea to run unprivileged
@@ -208,6 +208,9 @@ inside of the container.
208208
This command mounts a `tmpfs` at `/tmp` within the container. The supported mount options are the same as the Linux default `mount` flags. If you do not specify any options, the systems uses the following options:
209209
`rw,noexec,nosuid,nodev,size=65536k`.
210210

211+
**--tty**=true|false
212+
Allocate a new tty for the container process. The default is *false*.
213+
211214
**--uid**=UID
212215
Sets the UID used within the container.
213216

0 commit comments

Comments
 (0)