Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit de971df

Browse files
authored
Merge pull request #2520 from thaJeztah/19.03_backport_markup_touch_ups
[19.03 backport] docs: more Markdown touch-ups Upstream-commit: ab108430b26834f59f6fa72328cc77cc6b6ebf54 Component: cli
2 parents 4911428 + d64ef9e commit de971df

15 files changed

Lines changed: 452 additions & 371 deletions

components/cli/docs/reference/commandline/build.md

Lines changed: 44 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -384,14 +384,15 @@ contents of the `debug` file instead of looking for a `Dockerfile` and will use
384384
directory structure of the build context, regardless of how you refer to it on
385385
the command line.
386386

387-
> **Note:**
388-
> `docker build` will return a `no such file or directory` error if the
387+
> **Note**
388+
>
389+
> `docker build` returns a `no such file or directory` error if the
389390
> file or directory does not exist in the uploaded context. This may
390391
> happen if there is no context, or if you specify a file that is
391392
> elsewhere on the Host system. The context is limited to the current
392393
> directory (and its children) for security reasons, and to ensure
393394
> repeatable builds on remote Docker hosts. This is also the reason why
394-
> `ADD ../file` will not work.
395+
> `ADD ../file` does not work.
395396
396397
### Use a custom parent cgroup (--cgroup-parent)
397398

@@ -672,30 +673,47 @@ The `--squash` option has a number of known limitations:
672673

673674
#### Prerequisites
674675

675-
The example on this page is using experimental mode in Docker 1.13.
676-
677-
Experimental mode can be enabled by using the `--experimental` flag when starting the Docker daemon or setting `experimental: true` in the `daemon.json` configuration file.
678-
679-
By default, experimental mode is disabled. To see the current configuration, use the `docker version` command.
680-
681-
```none
682-
Server:
683-
Version: 1.13.1
684-
API version: 1.26 (minimum version 1.12)
685-
Go version: go1.7.5
686-
Git commit: 092cba3
687-
Built: Wed Feb 8 06:35:24 2017
688-
OS/Arch: linux/amd64
689-
Experimental: false
690-
676+
The example on this page is using experimental mode in Docker 19.03.
677+
678+
Experimental mode can be enabled by using the `--experimental` flag when starting
679+
the Docker daemon or setting `experimental: true` in the `daemon.json` configuration
680+
file.
681+
682+
By default, experimental mode is disabled. To see the current configuration of
683+
the docker daemon, use the `docker version` command and check the `Experimental`
684+
line in the `Engine` section:
685+
686+
```console
687+
Client: Docker Engine - Community
688+
Version: 19.03.8
689+
API version: 1.40
690+
Go version: go1.12.17
691+
Git commit: afacb8b
692+
Built: Wed Mar 11 01:21:11 2020
693+
OS/Arch: darwin/amd64
694+
Experimental: false
695+
696+
Server: Docker Engine - Community
697+
Engine:
698+
Version: 19.03.8
699+
API version: 1.40 (minimum version 1.12)
700+
Go version: go1.12.17
701+
Git commit: afacb8b
702+
Built: Wed Mar 11 01:29:16 2020
703+
OS/Arch: linux/amd64
704+
Experimental: true
691705
[...]
692706
```
693707

694-
To enable experimental mode, users need to restart the docker daemon with the experimental flag enabled.
708+
To enable experimental mode, users need to restart the docker daemon with the
709+
experimental flag enabled.
695710

696711
#### Enable Docker experimental
697712

698-
Experimental features are now included in the standard Docker binaries as of version 1.13.0. For enabling experimental features, you need to start the Docker daemon with `--experimental` flag. You can also enable the daemon flag via /etc/docker/daemon.json. e.g.
713+
Experimental features are now included in the standard Docker binaries as of
714+
version 1.13.0. For enabling experimental features, you need to start the
715+
Docker daemon with `--experimental` flag. You can also enable the daemon flag
716+
via `/etc/docker/daemon.json`. e.g.
699717

700718
```json
701719
{
@@ -731,7 +749,7 @@ $ docker build --squash -t test .
731749
[...]
732750
```
733751

734-
If everything is right, the history will look like this:
752+
If everything is right, the history looks like this:
735753

736754
```bash
737755
$ docker history test
@@ -747,6 +765,8 @@ IMAGE CREATED CREATED BY
747765
<missing> 7 weeks ago /bin/sh -c #(nop) ADD file:47ca6e777c36a4cfff 1.113 MB
748766
```
749767

750-
We could find that all layer's name is `<missing>`, and there is a new layer with COMMENT `merge`.
768+
We could find that a layer's name is `<missing>`, and there is a new layer with
769+
COMMENT `merge`.
751770

752-
Test the image, check for `/remove_me` being gone, make sure `hello\nworld` is in `/hello`, make sure the `HELLO` envvar's value is `world`.
771+
Test the image, check for `/remove_me` being gone, make sure `hello\nworld` is
772+
in `/hello`, make sure the `HELLO` environment variable's value is `world`.

0 commit comments

Comments
 (0)