diff --git a/cmd/ocitools/generate.go b/cmd/ocitools/generate.go index 99bce1a4e..6dd4ec7f6 100644 --- a/cmd/ocitools/generate.go +++ b/cmd/ocitools/generate.go @@ -36,7 +36,7 @@ var generateFlags = []cli.Flag{ cli.StringFlag{Name: "mount-label", Usage: "selinux mount context label"}, cli.StringSliceFlag{Name: "tmpfs", Usage: "mount tmpfs"}, cli.StringSliceFlag{Name: "args", Usage: "command to run in the container"}, - cli.StringSliceFlag{Name: "env", Usage: "add environment variable"}, + cli.StringSliceFlag{Name: "env", Usage: "add environment variable e.g. key=value"}, cli.StringFlag{Name: "cgroups-path", Usage: "specify the path to the cgroups"}, cli.StringFlag{Name: "mount-cgroups", Value: "no", Usage: "mount cgroups (rw,ro,no)"}, cli.StringSliceFlag{Name: "bind", Usage: "bind mount directories src:dest:(rw,ro)"}, diff --git a/man/ocitools-generate.1.md b/man/ocitools-generate.1.md index b52facc43..a530a8e1a 100644 --- a/man/ocitools-generate.1.md +++ b/man/ocitools-generate.1.md @@ -58,10 +58,10 @@ read the configuration from `config.json`. Current working directory for the process **--env**=[] - Set environment variables - This option allows you to specify arbitrary -environment variables that are available for the process that will be launched -inside of the container. + Set environment variables e.g. key=value. + This option allows you to specify arbitrary environment variables + that are available for the process that will be launched inside of + the container. **--gid**=GID Gid for the process inside of container @@ -84,6 +84,9 @@ inside of the container. The special *PATH* `host` removes any existing IPC namespace from the configuration. +**--label**=[] + Add annotations to the configuration e.g. key=value. + **--mount**=*PATH* Use a mount namespace where *PATH* is an existing mount namespace file to join. The special *PATH* empty-string creates a new namespace.