Skip to content

Update CLI reference docs with latest changes from 19.03 branch #11857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 8, 2020
Merged

Update CLI reference docs with latest changes from 19.03 branch #11857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions _data/engine-cli/docker_build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,14 +641,12 @@ examples: |-
### Use a custom parent cgroup (--cgroup-parent)

When `docker build` is run with the `--cgroup-parent` option the containers
used in the build will be run with the [corresponding `docker run`
flag](../run.md#specify-custom-cgroups).
used in the build will be run with the [corresponding `docker run` flag](../run.md#specify-custom-cgroups).

### Set ulimits in container (--ulimit)

Using the `--ulimit` option with `docker build` will cause each build step's
container to be started using those [`--ulimit`
flag values](run.md#set-ulimits-in-container---ulimit).
container to be started using those [`--ulimit` flag values](run.md#set-ulimits-in-container---ulimit).

### Set build-time variables (--build-arg)

Expand Down
2 changes: 1 addition & 1 deletion _data/engine-cli/docker_pull.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ examples: |-

```dockerfile
FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
MAINTAINER some maintainer <maintainer@example.com>
LABEL maintainer="some maintainer <maintainer@example.com>"
```

> **Note**
Expand Down