man: fix man-pages

The man-pages are using pre-formatted section to display the options for
all commands. The result on my system never looked correct:

OPTIONS
       --bundle value, -b value  path to the root [...]
          --console-socket value    path to an AF_UNIX [...]

The first line was always indented less than the other lines.

This commit makes the option block a pre-formatted block (as intended???) by
using 4 spaces instead of 3 spaces.

In addition the man-pages did not specify their name and section
correctly. This adds something like '% runc-run "8"' to all man-pages to
have correct title 'runc-run(8)' instead of 'NAME()' and it also adds
the section to the title: 'System Manager's Manual'.

This also fixes the use of '>' and '<' at multiple places. The markdown
source files were using "<container-id>" and similar which was (most of
the time) rendered as '""'. On some systems it was rendered correctly.

Signed-off-by: Adrian Reber <areber@redhat.com>
This commit is contained in:
Adrian Reber 2019-08-06 18:11:13 +00:00 committed by Adrian Reber
parent 2e94378464
commit 1712af0e80
No known key found for this signature in database
GPG Key ID: 82C9378ED3C4906A
17 changed files with 176 additions and 140 deletions

View File

@ -1,28 +1,30 @@
% runc-checkpoint "8"
# NAME # NAME
runc checkpoint - checkpoint a running container runc checkpoint - checkpoint a running container
# SYNOPSIS # SYNOPSIS
runc checkpoint [command options] <container-id> runc checkpoint [command options] `<container-id>`
Where "<container-id>" is the name for the instance of the container to be Where "`<container-id>`" is the name for the instance of the container to be
checkpointed. checkpointed.
# DESCRIPTION # DESCRIPTION
The checkpoint command saves the state of the container instance. The checkpoint command saves the state of the container instance.
# OPTIONS # OPTIONS
--image-path value path for saving criu image files --image-path value path for saving criu image files
--work-path value path for saving work files and logs --work-path value path for saving work files and logs
--parent-path value path for previous criu image files in pre-dump --parent-path value path for previous criu image files in pre-dump
--leave-running leave the process running after checkpointing --leave-running leave the process running after checkpointing
--tcp-established allow open tcp connections --tcp-established allow open tcp connections
--ext-unix-sk allow external unix sockets --ext-unix-sk allow external unix sockets
--shell-job allow shell jobs --shell-job allow shell jobs
--lazy-pages use userfaultfd to lazily restore memory pages --lazy-pages use userfaultfd to lazily restore memory pages
--status-fd value criu writes \0 to this FD once lazy-pages is ready --status-fd value criu writes \0 to this FD once lazy-pages is ready
--page-server value ADDRESS:PORT of the page server --page-server value ADDRESS:PORT of the page server
--file-locks handle file locks, for safety --file-locks handle file locks, for safety
--pre-dump dump container's memory information only, leave the container running after this --pre-dump dump container's memory information only, leave the container running after this
--manage-cgroups-mode value cgroups mode: 'soft' (default), 'full' and 'strict' --manage-cgroups-mode value cgroups mode: 'soft' (default), 'full' and 'strict'
--empty-ns value create a namespace, but don't restore its properties --empty-ns value create a namespace, but don't restore its properties
--auto-dedup enable auto deduplication of memory images --auto-dedup enable auto deduplication of memory images

View File

@ -1,10 +1,12 @@
% runc-create "8"
# NAME # NAME
runc create - create a container runc create - create a container
# SYNOPSIS # SYNOPSIS
runc create [command options] <container-id> runc create [command options] `<container-id>`
Where "<container-id>" is your name for the instance of the container that you Where "`<container-id>`" is your name for the instance of the container that you
are starting. The name you provide for the container instance must be unique on are starting. The name you provide for the container instance must be unique on
your host. your host.
@ -19,9 +21,9 @@ command(s) that get executed on start, edit the args parameter of the spec. See
"runc spec --help" for more explanation. "runc spec --help" for more explanation.
# OPTIONS # OPTIONS
--bundle value, -b value path to the root of the bundle directory, defaults to the current directory --bundle value, -b value path to the root of the bundle directory, defaults to the current directory
--console-socket value path to an AF_UNIX socket which will receive a file descriptor referencing the master end of the console's pseudoterminal --console-socket value path to an AF_UNIX socket which will receive a file descriptor referencing the master end of the console's pseudoterminal
--pid-file value specify the file to write the process id to --pid-file value specify the file to write the process id to
--no-pivot do not use pivot root to jail process inside rootfs. This should be used whenever the rootfs is on top of a ramdisk --no-pivot do not use pivot root to jail process inside rootfs. This should be used whenever the rootfs is on top of a ramdisk
--no-new-keyring do not create a new session keyring for the container. This will cause the container to inherit the calling processes session key --no-new-keyring do not create a new session keyring for the container. This will cause the container to inherit the calling processes session key
--preserve-fds value Pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0) --preserve-fds value Pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0)

View File

@ -1,13 +1,15 @@
% runc-delete "8"
# NAME # NAME
runc delete - delete any resources held by the container often used with detached container runc delete - delete any resources held by the container often used with detached container
# SYNOPSIS # SYNOPSIS
runc delete [command options] <container-id> runc delete [command options] `<container-id>`
Where "<container-id>" is the name for the instance of the container. Where "`<container-id>`" is the name for the instance of the container.
# OPTIONS # OPTIONS
--force, -f Forcibly deletes the container if it is still running (uses SIGKILL) --force, -f Forcibly deletes the container if it is still running (uses SIGKILL)
# EXAMPLE # EXAMPLE
For example, if the container id is "ubuntu01" and runc list currently shows the For example, if the container id is "ubuntu01" and runc list currently shows the

View File

@ -1,15 +1,17 @@
% runc-events "8"
# NAME # NAME
runc events - display container events such as OOM notifications, cpu, memory, and IO usage statistics runc events - display container events such as OOM notifications, cpu, memory, and IO usage statistics
# SYNOPSIS # SYNOPSIS
runc events [command options] <container-id> runc events [command options] `<container-id>`
Where "<container-id>" is the name for the instance of the container. Where "`<container-id>`" is the name for the instance of the container.
# DESCRIPTION # DESCRIPTION
The events command displays information about the container. By default the The events command displays information about the container. By default the
information is displayed once every 5 seconds. information is displayed once every 5 seconds.
# OPTIONS # OPTIONS
--interval value set the stats collection interval (default: 5s) --interval value set the stats collection interval (default: 5s)
--stats display the container's stats then exit --stats display the container's stats then exit

View File

@ -1,11 +1,13 @@
% runc-exec "8"
# NAME # NAME
runc exec - execute new process inside the container runc exec - execute new process inside the container
# SYNOPSIS # SYNOPSIS
runc exec [command options] <container-id> -- <container command> [args...] runc exec [command options] `<container-id>` -- `<container command>` [args...]
Where "<container-id>" is the name for the instance of the container and Where "`<container-id>`" is the name for the instance of the container and
"<container command>" is the command to be executed in the container. "`<container command>`" is the command to be executed in the container.
# EXAMPLE # EXAMPLE
For example, if the container is configured to run the linux ps command the For example, if the container is configured to run the linux ps command the
@ -14,18 +16,18 @@ following will output a list of processes running in the container:
# runc exec <container-id> ps # runc exec <container-id> ps
# OPTIONS # OPTIONS
--console value specify the pty slave path for use with the container --console value specify the pty slave path for use with the container
--cwd value current working directory in the container --cwd value current working directory in the container
--env value, -e value set environment variables --env value, -e value set environment variables
--tty, -t allocate a pseudo-TTY --tty, -t allocate a pseudo-TTY
--user value, -u value UID (format: <uid>[:<gid>]) --user value, -u value UID (format: <uid>[:<gid>])
--additional-gids value, -g value additional gids --additional-gids value, -g value additional gids
--process value, -p value path to the process.json --process value, -p value path to the process.json
--detach, -d detach from the container's process --detach, -d detach from the container's process
--pid-file value specify the file to write the process id to --pid-file value specify the file to write the process id to
--process-label value set the asm process label for the process commonly used with selinux --process-label value set the asm process label for the process commonly used with selinux
--apparmor value set the apparmor profile for the process --apparmor value set the apparmor profile for the process
--no-new-privs set the no new privileges value for the process --no-new-privs set the no new privileges value for the process
--cap value, -c value add a capability to the bounding set for the process --cap value, -c value add a capability to the bounding set for the process
--no-subreaper disable the use of the subreaper used to reap reparented processes --no-subreaper disable the use of the subreaper used to reap reparented processes
--preserve-fds value pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0) --preserve-fds value pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0)

View File

@ -1,14 +1,16 @@
% runc-kill "8"
# NAME # NAME
runc kill - kill sends the specified signal (default: SIGTERM) to the container's init process runc kill - kill sends the specified signal (default: SIGTERM) to the container's init process
# SYNOPSIS # SYNOPSIS
runc kill [command options] <container-id> <signal> runc kill [command options] `<container-id>` `<signal>`
Where "<container-id>" is the name for the instance of the container and Where "`<container-id>`" is the name for the instance of the container and
"<signal>" is the signal to be sent to the init process. "`<signal>`" is the signal to be sent to the init process.
# OPTIONS # OPTIONS
--all, -a send the specified signal to all processes inside the container --all, -a send the specified signal to all processes inside the container
# EXAMPLE # EXAMPLE

View File

@ -1,3 +1,5 @@
% runc-list "8"
# NAME # NAME
runc list - lists containers started by runc with the given root runc list - lists containers started by runc with the given root
@ -15,5 +17,5 @@ To list containers created using a non-default value for "--root":
# runc --root value list # runc --root value list
# OPTIONS # OPTIONS
--format value, -f value select one of: table or json (default: "table") --format value, -f value select one of: table or json (default: "table")
--quiet, -q display only container IDs --quiet, -q display only container IDs

View File

@ -1,10 +1,12 @@
% runc-pause "8"
# NAME # NAME
runc pause - pause suspends all processes inside the container runc pause - pause suspends all processes inside the container
# SYNOPSIS # SYNOPSIS
runc pause <container-id> runc pause `<container-id>`
Where "<container-id>" is the name for the instance of the container to be Where "`<container-id>`" is the name for the instance of the container to be
paused. paused.
# DESCRIPTION # DESCRIPTION

View File

@ -1,13 +1,15 @@
% runc-ps "8"
# NAME # NAME
runc ps - ps displays the processes running inside a container runc ps - ps displays the processes running inside a container
# SYNOPSIS # SYNOPSIS
runc ps [command options] <container-id> [ps options] runc ps [command options] `<container-id>` [ps options]
# OPTIONS # OPTIONS
--format value, -f value select one of: table(default) or json --format value, -f value select one of: table(default) or json
The default format is table. The following will output the processes of a container The default format is table. The following will output the processes of a container
in json format: in json format:
# runc ps -f json <container-id> # runc ps -f json <container-id>

View File

@ -1,10 +1,12 @@
% runc-restore "8"
# NAME # NAME
runc restore - restore a container from a previous checkpoint runc restore - restore a container from a previous checkpoint
# SYNOPSIS # SYNOPSIS
runc restore [command options] <container-id> runc restore [command options] `<container-id>`
Where "<container-id>" is the name for the instance of the container to be Where "`<container-id>`" is the name for the instance of the container to be
restored. restored.
# DESCRIPTION # DESCRIPTION
@ -12,15 +14,15 @@ restored.
using the runc checkpoint command. using the runc checkpoint command.
# OPTIONS # OPTIONS
--image-path value path to criu image files for restoring --image-path value path to criu image files for restoring
--work-path value path for saving work files and logs --work-path value path for saving work files and logs
--tcp-established allow open tcp connections --tcp-established allow open tcp connections
--ext-unix-sk allow external unix sockets --ext-unix-sk allow external unix sockets
--shell-job allow shell jobs --shell-job allow shell jobs
--file-locks handle file locks, for safety --file-locks handle file locks, for safety
--manage-cgroups-mode value cgroups mode: 'soft' (default), 'full' and 'strict' --manage-cgroups-mode value cgroups mode: 'soft' (default), 'full' and 'strict'
--bundle value, -b value path to the root of the bundle directory --bundle value, -b value path to the root of the bundle directory
--detach, -d detach from the container's process --detach, -d detach from the container's process
--pid-file value specify the file to write the process id to --pid-file value specify the file to write the process id to
--no-subreaper disable the use of the subreaper used to reap reparented processes --no-subreaper disable the use of the subreaper used to reap reparented processes
--no-pivot do not use pivot root to jail process inside rootfs. This should be used whenever the rootfs is on top of a ramdisk --no-pivot do not use pivot root to jail process inside rootfs. This should be used whenever the rootfs is on top of a ramdisk

View File

@ -1,10 +1,12 @@
% runc-resume "8"
# NAME # NAME
runc resume - resumes all processes that have been previously paused runc resume - resumes all processes that have been previously paused
# SYNOPSIS # SYNOPSIS
runc resume <container-id> runc resume `<container-id>`
Where "<container-id>" is the name for the instance of the container to be Where "`<container-id>`" is the name for the instance of the container to be
resumed. resumed.
# DESCRIPTION # DESCRIPTION

View File

@ -1,10 +1,12 @@
% runc-run "8"
# NAME # NAME
runc run - create and run a container runc run - create and run a container
# SYNOPSIS # SYNOPSIS
runc run [command options] <container-id> runc run [command options] `<container-id>`
Where "<container-id>" is your name for the instance of the container that you Where "`<container-id>`" is your name for the instance of the container that you
are starting. The name you provide for the container instance must be unique on are starting. The name you provide for the container instance must be unique on
your host. your host.
@ -19,11 +21,11 @@ command(s) that get executed on start, edit the args parameter of the spec. See
"runc spec --help" for more explanation. "runc spec --help" for more explanation.
# OPTIONS # OPTIONS
--bundle value, -b value path to the root of the bundle directory, defaults to the current directory --bundle value, -b value path to the root of the bundle directory, defaults to the current directory
--console-socket value path to an AF_UNIX socket which will receive a file descriptor referencing the master end of the console's pseudoterminal --console-socket value path to an AF_UNIX socket which will receive a file descriptor referencing the master end of the console's pseudoterminal
--detach, -d detach from the container's process --detach, -d detach from the container's process
--pid-file value specify the file to write the process id to --pid-file value specify the file to write the process id to
--no-subreaper disable the use of the subreaper used to reap reparented processes --no-subreaper disable the use of the subreaper used to reap reparented processes
--no-pivot do not use pivot root to jail process inside rootfs. This should be used whenever the rootfs is on top of a ramdisk --no-pivot do not use pivot root to jail process inside rootfs. This should be used whenever the rootfs is on top of a ramdisk
--no-new-keyring do not create a new session keyring for the container. This will cause the container to inherit the calling processes session key --no-new-keyring do not create a new session keyring for the container. This will cause the container to inherit the calling processes session key
--preserve-fds value Pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0) --preserve-fds value Pass N additional file descriptors to the container (stdio + $LISTEN_FDS + N in total) (default: 0)

View File

@ -1,3 +1,5 @@
% runc-spec "8"
# NAME # NAME
runc spec - create a new specification file runc spec - create a new specification file
@ -45,8 +47,10 @@ already running as root, you can use sudo to give runc root privilege. For
example: "sudo runc start container1" will give runc root privilege to start the example: "sudo runc start container1" will give runc root privilege to start the
container on your host. container on your host.
Alternatively, you can start a rootless container, which has the ability to run without root privileges. For this to work, the specification file needs to be adjusted accordingly. You can pass the parameter --rootless to this command to generate a proper rootless spec file. Alternatively, you can start a rootless container, which has the ability to run without root privileges.
For this to work, the specification file needs to be adjusted accordingly.
You can pass the parameter **--rootless** to this command to generate a proper rootless spec file.
# OPTIONS # OPTIONS
--bundle value, -b value path to the root of the bundle directory --bundle value, -b value path to the root of the bundle directory
--rootless generate a configuration for a rootless container --rootless generate a configuration for a rootless container

View File

@ -1,10 +1,12 @@
% runc-start "8"
# NAME # NAME
runc start - start executes the user defined process in a created container runc start - start executes the user defined process in a created container
# SYNOPSIS # SYNOPSIS
runc start <container-id> runc start `<container-id>`
Where "<container-id>" is your name for the instance of the container that you Where "`<container-id>`" is your name for the instance of the container that you
are starting. The name you provide for the container instance must be unique on are starting. The name you provide for the container instance must be unique on
your host. your host.

View File

@ -1,10 +1,12 @@
% runc-state "8"
# NAME # NAME
runc state - output the state of a container runc state - output the state of a container
# SYNOPSIS # SYNOPSIS
runc state <container-id> runc state `<container-id>`
Where "<container-id>" is your name for the instance of the container. Where "`<container-id>`" is your name for the instance of the container.
# DESCRIPTION # DESCRIPTION
The state command outputs current state information for the The state command outputs current state information for the

View File

@ -1,8 +1,10 @@
% runc-update "8"
# NAME # NAME
runc update - update container resource constraints runc update - update container resource constraints
# SYNOPSIS # SYNOPSIS
runc update [command options] <container-id> runc update [command options] `<container-id>`
# DESCRIPTION # DESCRIPTION
The data can be read from a file or the standard input, the The data can be read from a file or the standard input, the
@ -34,20 +36,20 @@ Note: if data is to be read from a file or the standard input, all
other options are ignored. other options are ignored.
# OPTIONS # OPTIONS
--resources value, -r value path to the file containing the resources to update or '-' to read from the standard input --resources value, -r value path to the file containing the resources to update or '-' to read from the standard input
--blkio-weight value Specifies per cgroup weight, range is from 10 to 1000 (default: 0) --blkio-weight value Specifies per cgroup weight, range is from 10 to 1000 (default: 0)
--cpu-period value CPU CFS period to be used for hardcapping (in usecs). 0 to use system default --cpu-period value CPU CFS period to be used for hardcapping (in usecs). 0 to use system default
--cpu-quota value CPU CFS hardcap limit (in usecs). Allowed cpu time in a given period --cpu-quota value CPU CFS hardcap limit (in usecs). Allowed cpu time in a given period
--cpu-rt-period value CPU realtime period to be used for hardcapping (in usecs). 0 to use system default --cpu-rt-period value CPU realtime period to be used for hardcapping (in usecs). 0 to use system default
--cpu-rt-runtime value CPU realtime hardcap limit (in usecs). Allowed cpu time in a given period --cpu-rt-runtime value CPU realtime hardcap limit (in usecs). Allowed cpu time in a given period
--cpu-share value CPU shares (relative weight vs. other containers) --cpu-share value CPU shares (relative weight vs. other containers)
--cpuset-cpus value CPU(s) to use --cpuset-cpus value CPU(s) to use
--cpuset-mems value Memory node(s) to use --cpuset-mems value Memory node(s) to use
--kernel-memory value Kernel memory limit (in bytes) --kernel-memory value Kernel memory limit (in bytes)
--kernel-memory-tcp value Kernel memory limit (in bytes) for tcp buffer --kernel-memory-tcp value Kernel memory limit (in bytes) for tcp buffer
--memory value Memory limit (in bytes) --memory value Memory limit (in bytes)
--memory-reservation value Memory reservation or soft_limit (in bytes) --memory-reservation value Memory reservation or soft_limit (in bytes)
--memory-swap value Total memory usage (memory + swap); set '-1' to enable unlimited swap --memory-swap value Total memory usage (memory + swap); set '-1' to enable unlimited swap
--pids-limit value Maximum number of pids allowed in the container (default: 0) --pids-limit value Maximum number of pids allowed in the container (default: 0)
--l3-cache-schema The string of Intel RDT/CAT L3 cache schema --l3-cache-schema The string of Intel RDT/CAT L3 cache schema
--mem-bw-schema The string of Intel RDT/MBA memory bandwidth schema --mem-bw-schema The string of Intel RDT/MBA memory bandwidth schema

View File

@ -1,3 +1,5 @@
% runc "8"
# NAME # NAME
runc - Open Container Initiative runtime runc - Open Container Initiative runtime
@ -22,38 +24,38 @@ To start a new instance of a container:
# runc start [ -b bundle ] <container-id> # runc start [ -b bundle ] <container-id>
Where "<container-id>" is your name for the instance of the container that you Where "`<container-id>`" is your name for the instance of the container that you
are starting. The name you provide for the container instance must be unique on are starting. The name you provide for the container instance must be unique on
your host. Providing the bundle directory using "-b" is optional. The default your host. Providing the bundle directory using "-b" is optional. The default
value for "bundle" is the current directory. value for "bundle" is the current directory.
# COMMANDS # COMMANDS
checkpoint checkpoint a running container checkpoint checkpoint a running container
create create a container create create a container
delete delete any resources held by the container often used with detached containers delete delete any resources held by the container often used with detached containers
events display container events such as OOM notifications, cpu, memory, IO and network stats events display container events such as OOM notifications, cpu, memory, IO and network stats
exec execute new process inside the container exec execute new process inside the container
init initialize the namespaces and launch the process (do not call it outside of runc) init initialize the namespaces and launch the process (do not call it outside of runc)
kill kill sends the specified signal (default: SIGTERM) to the container's init process kill kill sends the specified signal (default: SIGTERM) to the container's init process
list lists containers started by runc with the given root list lists containers started by runc with the given root
pause pause suspends all processes inside the container pause pause suspends all processes inside the container
ps displays the processes running inside a container ps displays the processes running inside a container
restore restore a container from a previous checkpoint restore restore a container from a previous checkpoint
resume resumes all processes that have been previously paused resume resumes all processes that have been previously paused
run create and run a container run create and run a container
spec create a new specification file spec create a new specification file
start executes the user defined process in a created container start executes the user defined process in a created container
state output the state of a container state output the state of a container
update update container resource constraints update update container resource constraints
help, h Shows a list of commands or help for one command help, h Shows a list of commands or help for one command
# GLOBAL OPTIONS # GLOBAL OPTIONS
--debug enable debug output for logging --debug enable debug output for logging
--log value set the log file path where internal debug information is written (default: "/dev/null") --log value set the log file path where internal debug information is written (default: "/dev/null")
--log-format value set the format used by logs ('text' (default), or 'json') (default: "text") --log-format value set the format used by logs ('text' (default), or 'json') (default: "text")
--root value root directory for storage of container state (this should be located in tmpfs) (default: "/run/runc" or $XDG_RUNTIME_DIR/runc for rootless containers) --root value root directory for storage of container state (this should be located in tmpfs) (default: "/run/runc" or $XDG_RUNTIME_DIR/runc for rootless containers)
--criu value path to the criu binary used for checkpoint and restore (default: "criu") --criu value path to the criu binary used for checkpoint and restore (default: "criu")
--systemd-cgroup enable systemd cgroup support, expects cgroupsPath to be of form "slice:prefix:name" for e.g. "system.slice:runc:434234" --systemd-cgroup enable systemd cgroup support, expects cgroupsPath to be of form "slice:prefix:name" for e.g. "system.slice:runc:434234"
--rootless value enable rootless mode ('true', 'false', or 'auto') (default: "auto") --rootless value enable rootless mode ('true', 'false', or 'auto') (default: "auto")
--help, -h show help --help, -h show help
--version, -v print the version --version, -v print the version