Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

docs: make options table more consistent #2231

Merged
merged 1 commit into from
Apr 7, 2016
Merged

Conversation

robszumski
Copy link
Contributor

This diff turned out nastier than expected even though the changes aren't that crazy.

This fixes a few problems:

  1. items with no default are specified with empty backticks instead of none
  2. A few of the long code strings were causing some layout issues because they couldn't be wrapped.
  3. In several places the options columns was being used for the description
  4. Inconsistent use of columns led to ambiguity around the format of some stage1 options. For example, is this a name or a path? Is this an absolute or relative url?

Note that due to the wide nature of this table, it will overflow the bounds of the page on coreos.com on smaller screens. This is not ideal, but at known issue that is ok for now.

cc: @kbrwn

@iaguis
Copy link
Member

iaguis commented Feb 26, 2016

Lots of tables to change 😦

| `--interactive` | `false` | `true` or `false` | Run pod interactively. If true, only one image may be supplied. |
| `--mds-register` | `false` | `true` or `false` | Register pod with metadata service. It needs network connectivity to the host (`--net` as `default`, `default-restricted`, or `host`). |
| `--memory` | none | Memory units (ex. `--memory=50M`) | Memory limit for the preceding image in [Kubernetes resource model](http://kubernetes.io/v1.1/docs/design/resources.html) format. |
| `--mount` | none | Mount syntax (ex. `volume=NAME,target=PATH`) | Mount point binding a volume to a path within an app. See [Mounting Volumes without Mount Points](#mounting-volumes-without-mount-points). |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double-dash missing:

ex. --volume=NAME,target=PATH

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, actually that was correct. I was confused because it didn't repeat the option like in other example.

If there is enough place, --mount volume=NAME,target=PATH would be better.

@alban
Copy link
Member

alban commented Feb 26, 2016

Similar changes should be done in Documentation/subcommands/prepare.md

| `--stage1-path` | none | Absolute or relative path | A path to a stage1 image. Absolute and relative paths are supported. |
| `--stage1-name` | none | Image name | A name of a stage1 image. Will perform a discovery if the image is not in the store. |
| `--stage1-hash` | none | Image hash | A hash of a stage1 image. The image must exist in the store. |
| `--stage1-from-dir` | none | Image name | A stage1 image file name to search for inside the default stage1 images directory. |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Example:

--stage1-from-dir=stage1-coreos.aci

@alban alban added this to the v1.2.0 milestone Feb 26, 2016
@robszumski
Copy link
Contributor Author

@iaguis do you mean that this table is repeated, or that the same inconsistencies fixed here are represented elsewhere?

@robszumski
Copy link
Contributor Author

Addressed feedback. I updated prepare.md with the same content as run.md when the options matched.

| `--no-overlay` | `false` | `true` or `false` | Disable the overlay filesystem. |
| `--no-store` | `false` | `true` or `false` | Fetch images, ignoring the local store. See [image fetching behavior](../image-fetching-behavior.md) |
| `--pod-manifest` | none | A path | The path to the pod manifest. If it's non-empty, then only `--net`, `--no-overlay` and `--interactive` will have effect. |
| `--port` | none | A port number (ex. `--port=NAME:HOSTPORT`) | Ports to expose on the host (requires [contained network](https://github.com/coreos/rkt/blob/master/Documentation/networking.md#contained-mode)). |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the link to networking.md need to be fully qualified? I think that just ../networking.md#contained-mode is enough.

@alban
Copy link
Member

alban commented Mar 17, 2016

@robszumski ping

@alban alban modified the milestones: v1.3.0, v1.2.0 Mar 17, 2016
@robszumski
Copy link
Contributor Author

@alban ack, need to find some time to complete this

@krnowak
Copy link
Collaborator

krnowak commented Mar 31, 2016

Needs rebase.

@robszumski
Copy link
Contributor Author

Rebased, will squash after any last feedback

| `--private-users` | `false` | `true` or `false` | Run within user namespaces (experimental) |
| `--quiet` | `false` | `true` or `false` | Suppress superfluous output on stdout, print only the UUID on success |
<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failed rebase?

@robszumski
Copy link
Contributor Author

@krnowak fix, rebased, PTAL

@krnowak
Copy link
Collaborator

krnowak commented Apr 7, 2016

LFAD.

@krnowak krnowak merged commit cfc0d7f into rkt:master Apr 7, 2016
@iaguis iaguis mentioned this pull request Apr 27, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants