From ec957f6802d43ca9b216727b94b3e2914f6f1093 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 8 Dec 2020 12:06:52 +0100 Subject: [PATCH] Update CLI reference docs with latest changes from 19.03 branch Signed-off-by: Sebastiaan van Stijn --- _data/engine-cli/docker_build.yaml | 6 ++---- _data/engine-cli/docker_pull.yaml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/_data/engine-cli/docker_build.yaml b/_data/engine-cli/docker_build.yaml index f853b8f8b540..340d6fbc9049 100644 --- a/_data/engine-cli/docker_build.yaml +++ b/_data/engine-cli/docker_build.yaml @@ -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) diff --git a/_data/engine-cli/docker_pull.yaml b/_data/engine-cli/docker_pull.yaml index b06db059c7a4..230cda3de961 100644 --- a/_data/engine-cli/docker_pull.yaml +++ b/_data/engine-cli/docker_pull.yaml @@ -181,7 +181,7 @@ examples: |- ```dockerfile FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2 - MAINTAINER some maintainer + LABEL maintainer="some maintainer " ``` > **Note**