From b55f4bf601c0f5c21e727405a06fc818729d989e Mon Sep 17 00:00:00 2001 From: Karel Malec Date: Wed, 7 Jun 2017 21:11:22 +0200 Subject: [PATCH] Fix backticks in docs; refine --debug comment --- client/driver/rkt.go | 2 +- website/source/docs/drivers/rkt.html.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/driver/rkt.go b/client/driver/rkt.go index fe07253e8..100542878 100644 --- a/client/driver/rkt.go +++ b/client/driver/rkt.go @@ -275,7 +275,7 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e cmdArgs = append(cmdArgs, "--insecure-options=all") } - // same for debug + // debug is rkt's global argument, so add it before the actual "run" cmdArgs = append(cmdArgs, fmt.Sprintf("--debug=%t", debug)) cmdArgs = append(cmdArgs, "run") diff --git a/website/source/docs/drivers/rkt.html.md b/website/source/docs/drivers/rkt.html.md index d52186ae3..3affd0345 100644 --- a/website/source/docs/drivers/rkt.html.md +++ b/website/source/docs/drivers/rkt.html.md @@ -62,10 +62,10 @@ The `rkt` driver supports the following configuration in the job spec: * `trust_prefix` - (Optional) The trust prefix to be passed to rkt. Must be reachable from the box running the nomad agent. If not specified, the image is - run with ```--insecure-options=all```. + run with `--insecure-options=all`. -* `insecure_options` - (Optional) List of insecure options for rkt. Consult ```rkt --help``` - for list of supported values. This list overrides the ```--insecure-options=all``` when +* `insecure_options` - (Optional) List of insecure options for rkt. Consult `rkt --help` + for list of supported values. This list overrides the `--insecure-options=all` default when no ```trust_prefix``` is provided in the job config, which can be effectively used to enforce secure runs, using ```insecure_options = ["none"]``` option.