surfacing Learn by example topics to top level of Docker Engine docs
fixing links after moving surfacing tutorials fixing more links for the newly located tutorials Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
parent
b9997ebdee
commit
d3b7a2779e
@ -100,7 +100,7 @@ the `Using cache` message in the console output.
|
|||||||
Successfully built 7ea8aef582cc
|
Successfully built 7ea8aef582cc
|
||||||
|
|
||||||
When you're done with your build, you're ready to look into [*Pushing a
|
When you're done with your build, you're ready to look into [*Pushing a
|
||||||
repository to its registry*](../userguide/containers/dockerrepos.md#contributing-to-docker-hub).
|
repository to its registry*](../tutorials/dockerrepos.md#contributing-to-docker-hub).
|
||||||
|
|
||||||
## Format
|
## Format
|
||||||
|
|
||||||
@ -474,7 +474,7 @@ Or
|
|||||||
The `FROM` instruction sets the [*Base Image*](glossary.md#base-image)
|
The `FROM` instruction sets the [*Base Image*](glossary.md#base-image)
|
||||||
for subsequent instructions. As such, a valid `Dockerfile` must have `FROM` as
|
for subsequent instructions. As such, a valid `Dockerfile` must have `FROM` as
|
||||||
its first instruction. The image can be any valid image – it is especially easy
|
its first instruction. The image can be any valid image – it is especially easy
|
||||||
to start by **pulling an image** from the [*Public Repositories*](../userguide/containers/dockerrepos.md).
|
to start by **pulling an image** from the [*Public Repositories*](../tutorials/dockerrepos.md).
|
||||||
|
|
||||||
- `FROM` must be the first non-comment instruction in the `Dockerfile`.
|
- `FROM` must be the first non-comment instruction in the `Dockerfile`.
|
||||||
|
|
||||||
@ -1171,7 +1171,7 @@ containers. The value can be a JSON array, `VOLUME ["/var/log/"]`, or a plain
|
|||||||
string with multiple arguments, such as `VOLUME /var/log` or `VOLUME /var/log
|
string with multiple arguments, such as `VOLUME /var/log` or `VOLUME /var/log
|
||||||
/var/db`. For more information/examples and mounting instructions via the
|
/var/db`. For more information/examples and mounting instructions via the
|
||||||
Docker client, refer to
|
Docker client, refer to
|
||||||
[*Share Directories via Volumes*](../userguide/containers/dockervolumes.md#mount-a-host-directory-as-a-data-volume)
|
[*Share Directories via Volumes*](../tutorials/dockervolumes.md#mount-a-host-directory-as-a-data-volume)
|
||||||
documentation.
|
documentation.
|
||||||
|
|
||||||
The `docker run` command initializes the newly created volume with any data
|
The `docker run` command initializes the newly created volume with any data
|
||||||
|
@ -23,7 +23,7 @@ the container, `docker export` will export the contents of the *underlying*
|
|||||||
directory, not the contents of the volume.
|
directory, not the contents of the volume.
|
||||||
|
|
||||||
Refer to [Backup, restore, or migrate data
|
Refer to [Backup, restore, or migrate data
|
||||||
volumes](../../userguide/containers/dockervolumes.md#backup-restore-or-migrate-data-volumes) in
|
volumes](../../tutorials/dockervolumes.md#backup-restore-or-migrate-data-volumes) in
|
||||||
the user guide for examples on exporting data in a volume.
|
the user guide for examples on exporting data in a volume.
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
@ -24,7 +24,7 @@ parent = "smn_cli"
|
|||||||
|
|
||||||
Search [Docker Hub](https://hub.docker.com) for images
|
Search [Docker Hub](https://hub.docker.com) for images
|
||||||
|
|
||||||
See [*Find Public Images on Docker Hub*](../../userguide/containers/dockerrepos.md#searching-for-images) for
|
See [*Find Public Images on Docker Hub*](../../tutorials/dockerrepos.md#searching-for-images) for
|
||||||
more details on finding shared images from the command line.
|
more details on finding shared images from the command line.
|
||||||
|
|
||||||
> **Note:**
|
> **Note:**
|
||||||
@ -124,5 +124,3 @@ This example displays images with a name containing 'busybox', at least
|
|||||||
NAME DESCRIPTION STARS OFFICIAL AUTOMATED
|
NAME DESCRIPTION STARS OFFICIAL AUTOMATED
|
||||||
progrium/busybox 50 [OK]
|
progrium/busybox 50 [OK]
|
||||||
radial/busyboxplus Full-chain, Internet enabled, busybox made... 8 [OK]
|
radial/busyboxplus Full-chain, Internet enabled, busybox made... 8 [OK]
|
||||||
|
|
||||||
|
|
||||||
|
@ -19,10 +19,10 @@ parent = "smn_cli"
|
|||||||
An image name is made up of slash-separated name components, optionally prefixed
|
An image name is made up of slash-separated name components, optionally prefixed
|
||||||
by a registry hostname. The hostname must comply with standard DNS rules, but
|
by a registry hostname. The hostname must comply with standard DNS rules, but
|
||||||
may not contain underscores. If a hostname is present, it may optionally be
|
may not contain underscores. If a hostname is present, it may optionally be
|
||||||
followed by a port number in the format `:8080`. If not present, the command
|
followed by a port number in the format `:8080`. If not present, the command
|
||||||
uses Docker's public registry located at `registry-1.docker.io` by default. Name
|
uses Docker's public registry located at `registry-1.docker.io` by default. Name
|
||||||
components may contain lowercase characters, digits and separators. A separator
|
components may contain lowercase characters, digits and separators. A separator
|
||||||
is defined as a period, one or two underscores, or one or more dashes. A name
|
is defined as a period, one or two underscores, or one or more dashes. A name
|
||||||
component may not start or end with a separator.
|
component may not start or end with a separator.
|
||||||
|
|
||||||
A tag name may contain lowercase and uppercase characters, digits, underscores,
|
A tag name may contain lowercase and uppercase characters, digits, underscores,
|
||||||
@ -30,20 +30,20 @@ periods and dashes. A tag name may not start with a period or a dash and may
|
|||||||
contain a maximum of 128 characters.
|
contain a maximum of 128 characters.
|
||||||
|
|
||||||
You can group your images together using names and tags, and then upload them
|
You can group your images together using names and tags, and then upload them
|
||||||
to [*Share Images via Repositories*](../../userguide/containers/dockerrepos.md#contributing-to-docker-hub).
|
to [*Share Images via Repositories*](../../tutorials/dockerrepos.md#contributing-to-docker-hub).
|
||||||
|
|
||||||
# Examples
|
# Examples
|
||||||
|
|
||||||
## Tagging an image referenced by ID
|
## Tagging an image referenced by ID
|
||||||
|
|
||||||
To tag a local image with ID "0e5574283393" into the "fedora" repository with
|
To tag a local image with ID "0e5574283393" into the "fedora" repository with
|
||||||
"version1.0":
|
"version1.0":
|
||||||
|
|
||||||
docker tag 0e5574283393 fedora/httpd:version1.0
|
docker tag 0e5574283393 fedora/httpd:version1.0
|
||||||
|
|
||||||
## Tagging an image referenced by Name
|
## Tagging an image referenced by Name
|
||||||
|
|
||||||
To tag a local image with name "httpd" into the "fedora" repository with
|
To tag a local image with name "httpd" into the "fedora" repository with
|
||||||
"version1.0":
|
"version1.0":
|
||||||
|
|
||||||
docker tag httpd fedora/httpd:version1.0
|
docker tag httpd fedora/httpd:version1.0
|
||||||
|
@ -73,4 +73,4 @@ $ docker volume create --driver local --opt type=btrfs --opt device=/dev/sda2
|
|||||||
* [volume inspect](volume_inspect.md)
|
* [volume inspect](volume_inspect.md)
|
||||||
* [volume ls](volume_ls.md)
|
* [volume ls](volume_ls.md)
|
||||||
* [volume rm](volume_rm.md)
|
* [volume rm](volume_rm.md)
|
||||||
* [Understand Data Volumes](../../userguide/containers/dockervolumes.md)
|
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
|
||||||
|
@ -45,4 +45,4 @@ Example output:
|
|||||||
* [volume create](volume_create.md)
|
* [volume create](volume_create.md)
|
||||||
* [volume ls](volume_ls.md)
|
* [volume ls](volume_ls.md)
|
||||||
* [volume rm](volume_rm.md)
|
* [volume rm](volume_rm.md)
|
||||||
* [Understand Data Volumes](../../userguide/containers/dockervolumes.md)
|
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
|
||||||
|
@ -81,4 +81,4 @@ The following filter matches all volumes with a name containing the `rose` strin
|
|||||||
* [volume create](volume_create.md)
|
* [volume create](volume_create.md)
|
||||||
* [volume inspect](volume_inspect.md)
|
* [volume inspect](volume_inspect.md)
|
||||||
* [volume rm](volume_rm.md)
|
* [volume rm](volume_rm.md)
|
||||||
* [Understand Data Volumes](../../userguide/containers/dockervolumes.md)
|
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
|
||||||
|
@ -26,4 +26,4 @@ Removes one or more volumes. You cannot remove a volume that is in use by a cont
|
|||||||
* [volume create](volume_create.md)
|
* [volume create](volume_create.md)
|
||||||
* [volume inspect](volume_inspect.md)
|
* [volume inspect](volume_inspect.md)
|
||||||
* [volume ls](volume_ls.md)
|
* [volume ls](volume_ls.md)
|
||||||
* [Understand Data Volumes](../../userguide/containers/dockervolumes.md)
|
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
|
||||||
|
@ -1078,7 +1078,7 @@ Both flags take limits in the `<device-path>:<limit>` format. Both read and
|
|||||||
write rates must be a positive integer.
|
write rates must be a positive integer.
|
||||||
|
|
||||||
## Additional groups
|
## Additional groups
|
||||||
--group-add: Add additional groups to run as
|
--group-add: Add additional groups to run as
|
||||||
|
|
||||||
By default, the docker container process runs with the supplementary groups looked
|
By default, the docker container process runs with the supplementary groups looked
|
||||||
up for the specified user. If one wants to add more to that list of groups, then
|
up for the specified user. If one wants to add more to that list of groups, then
|
||||||
@ -1502,8 +1502,8 @@ The example below mounts an empty tmpfs into the container with the `rw`,
|
|||||||
> a volume.
|
> a volume.
|
||||||
|
|
||||||
The volumes commands are complex enough to have their own documentation
|
The volumes commands are complex enough to have their own documentation
|
||||||
in section [*Managing data in
|
in section [*Manage data in
|
||||||
containers*](../userguide/containers/dockervolumes.md). A developer can define
|
containers*](../tutorials/dockervolumes.md). A developer can define
|
||||||
one or more `VOLUME`'s associated with an image, but only the operator
|
one or more `VOLUME`'s associated with an image, but only the operator
|
||||||
can give access from one container to another (or from a container to a
|
can give access from one container to another (or from a container to a
|
||||||
volume mounted on the host).
|
volume mounted on the host).
|
||||||
@ -1532,7 +1532,7 @@ Dockerfile `USER` instruction. When starting a container, the operator can overr
|
|||||||
the `USER` instruction by passing the `-u` option.
|
the `USER` instruction by passing the `-u` option.
|
||||||
|
|
||||||
-u="", --user="": Sets the username or UID used and optionally the groupname or GID for the specified command.
|
-u="", --user="": Sets the username or UID used and optionally the groupname or GID for the specified command.
|
||||||
|
|
||||||
The followings examples are all valid:
|
The followings examples are all valid:
|
||||||
--user=[ user | user:group | uid | uid:gid | user:gid | uid:group ]
|
--user=[ user | user:group | uid | uid:gid | user:gid | uid:group ]
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user