зеркало из https://github.com/microsoft/docker.git
Merge pull request #6764 from SvenDowideit/pr_out_blindly_make_all_uses_of_e_g_into_e_g_
blindly make all uses of e\.?g\.? into e.g.,
This commit is contained in:
Sven Dowideit
Коммит
3f18afc94c
|
|
@ -70,7 +70,7 @@ in their shell:
|
|||
|
||||
### Images
|
||||
|
||||
When you need to add images, try to make them as small as possible (e.g. as
|
||||
When you need to add images, try to make them as small as possible (e.g., as
|
||||
gifs). Usually images should go in the same directory as the `.md` file which
|
||||
references them, or in a subdirectory if one already exists.
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ or
|
|||
they omit the executable, an ENTRYPOINT must be specified.
|
||||
When used in the shell or exec formats, the CMD instruction sets the command to
|
||||
be executed when running the image.
|
||||
If you use the shell form of of the CMD, the <command> executes in /bin/sh -c:
|
||||
If you use the shell form of the CMD, the <command> executes in /bin/sh -c:
|
||||
**FROM ubuntu**
|
||||
**CMD echo "This is a test." | wc -**
|
||||
If you run <command> wihtout a shell, then you must express the command as a
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Using an existing container's name or ID you can create a new image.
|
|||
|
||||
# OPTIONS
|
||||
**-a, --author**=""
|
||||
Author name. (eg. "John Hannibal Smith <hannibal@a-team.com>"
|
||||
Author name. (e.g., "John Hannibal Smith <hannibal@a-team.com>"
|
||||
|
||||
**-m, --message**=""
|
||||
Commit message
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ docker-images - List the images in the local repository
|
|||
This command lists the images stored in the local Docker repository.
|
||||
|
||||
By default, intermediate images, used during builds, are not listed. Some of the
|
||||
output, e.g. image ID, is truncated, for space reasons. However the truncated
|
||||
output, e.g., image ID, is truncated, for space reasons. However the truncated
|
||||
image ID, and often the first few characters, are enough to be used in other
|
||||
Docker commands that use the image ID. The output includes repository, tag, image
|
||||
ID, date created and the virtual size.
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ output:
|
|||
|
||||
## Getting information on an image
|
||||
|
||||
Use an image's ID or name (e.g. repository/name[:tag]) to get information
|
||||
Use an image's ID or name (e.g., repository/name[:tag]) to get information
|
||||
on it.
|
||||
|
||||
# docker inspect 58394af37342
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ docker-pull - Pull an image or a repository from the registry
|
|||
# DESCRIPTION
|
||||
|
||||
This command pulls down an image or a repository from the registry. If
|
||||
there is more than one image for a repository (e.g. fedora) then all
|
||||
there is more than one image for a repository (e.g., fedora) then all
|
||||
images for that repository name are pulled down including any tags.
|
||||
It is also possible to specify a non-default registry to pull from.
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ docker-run - Run a process in an isolated container
|
|||
[**--link**=*name*:*alias*]
|
||||
[**-e**|**--env**=*environment*] [**--entrypoint**=*command*]
|
||||
[**--expose**=*port*] [**-P**|**--publish-all**[=*false*]]
|
||||
[**-p**|**--publish**=*port-mappping*] [**-h**|**--hostname**=*hostname*]
|
||||
[**-p**|**--publish**=*port-mapping*] [**-h**|**--hostname**=*hostname*]
|
||||
[**--rm**[=*false*]] [**--privileged**[=*false*]]
|
||||
[**-i**|**--interactive**[=*false*]]
|
||||
[**-t**|**--tty**[=*false*]] [**--lxc-conf**=*options*]
|
||||
|
|
@ -71,7 +71,7 @@ stopping the process by pressing the keys CTRL-P CTRL-Q.
|
|||
**--dns**=*IP-address*
|
||||
Set custom DNS servers. This option can be used to override the DNS
|
||||
configuration passed to the container. Typically this is necessary when the
|
||||
host DNS configuration is invalid for the container (eg. 127.0.0.1). When this
|
||||
host DNS configuration is invalid for the container (e.g., 127.0.0.1). When this
|
||||
is the case the **-dns** flags is necessary for every run.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ Note that here TAG is a part of the overall name or "tag".
|
|||
|
||||
## Giving an image a new alias
|
||||
|
||||
Here is an example of aliasing an image (e.g. 0e5574283393) as "httpd" and
|
||||
Here is an example of aliasing an image (e.g., 0e5574283393) as "httpd" and
|
||||
tagging it into the "fedora" repository with "version1.0":
|
||||
|
||||
docker tag 0e5574283393 fedora/httpd:version1.0
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ The first two steps can be done as part of a Dockerfile, as follows.
|
|||
ENTRYPOINT ["/var/cfengine/bin/docker_processes_run.sh"]
|
||||
|
||||
By saving this file as Dockerfile to a working directory, you can then build
|
||||
your image with the docker build command, e.g.
|
||||
your image with the docker build command, e.g.,
|
||||
`docker build -t managed_image`.
|
||||
|
||||
### Testing the container
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ keys:
|
|||
$ openssl req -new -x509 -days 365 -key ca-key.pem -out ca.pem
|
||||
|
||||
Now that we have a CA, you can create a server key and certificate
|
||||
signing request. Make sure that "Common Name (e.g. server FQDN or YOUR
|
||||
signing request. Make sure that "Common Name (e.g., server FQDN or YOUR
|
||||
name)" matches the hostname you will use to connect to Docker or just
|
||||
use `\*` for a certificate valid for any hostname:
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ known to the system, the hierarchy they belong to, and how many groups they cont
|
|||
|
||||
You can also look at `/proc/<pid>/cgroup` to see which control groups a process
|
||||
belongs to. The control group will be shown as a path relative to the root of
|
||||
the hierarchy mountpoint; e.g. `/` means “this process has not been assigned into
|
||||
the hierarchy mountpoint; e.g., `/` means “this process has not been assigned into
|
||||
a particular group”, while `/lxc/pumpkin` means that the process is likely to be
|
||||
a member of a container named `pumpkin`.
|
||||
|
||||
|
|
@ -106,9 +106,9 @@ to the processes within the cgroup, excluding sub-cgroups. The second half
|
|||
(with the `total_` prefix) includes sub-cgroups as well.
|
||||
|
||||
Some metrics are "gauges", i.e. values that can increase or decrease
|
||||
(e.g. swap, the amount of swap space used by the members of the cgroup).
|
||||
(e.g., swap, the amount of swap space used by the members of the cgroup).
|
||||
Some others are "counters", i.e. values that can only go up, because
|
||||
they represent occurrences of a specific event (e.g. pgfault, which
|
||||
they represent occurrences of a specific event (e.g., pgfault, which
|
||||
indicates the number of page faults which happened since the creation of
|
||||
the cgroup; this number can never decrease).
|
||||
|
||||
|
|
@ -410,7 +410,7 @@ used.
|
|||
|
||||
Docker makes this difficult because it relies on `lxc-start`, which
|
||||
carefully cleans up after itself, but it is still possible. It is
|
||||
usually easier to collect metrics at regular intervals (e.g. every
|
||||
usually easier to collect metrics at regular intervals (e.g., every
|
||||
minute, with the collectd LXC plugin) and rely on that instead.
|
||||
|
||||
But, if you'd still like to gather the stats when a container stops,
|
||||
|
|
|
|||
|
|
@ -91,8 +91,8 @@ without any restriction. This sounds crazy? Well, you have to know that
|
|||
same way**. Nothing prevents you from sharing your root filesystem (or
|
||||
even your root block device) with a virtual machine.
|
||||
|
||||
This has a strong security implication: if you instrument Docker from
|
||||
e.g. a web server to provision containers through an API, you should be
|
||||
This has a strong security implication: for example, if you instrument Docker
|
||||
from a web server to provision containers through an API, you should be
|
||||
even more careful than usual with parameter checking, to make sure that
|
||||
a malicious user cannot pass crafted parameters causing Docker to create
|
||||
arbitrary containers.
|
||||
|
|
@ -108,7 +108,7 @@ socket.
|
|||
You can also expose the REST API over HTTP if you explicitly decide so.
|
||||
However, if you do that, being aware of the above mentioned security
|
||||
implication, you should ensure that it will be reachable only from a
|
||||
trusted network or VPN; or protected with e.g. `stunnel` and client SSL
|
||||
trusted network or VPN; or protected with e.g., `stunnel` and client SSL
|
||||
certificates. You can also secure them with [HTTPS and
|
||||
certificates](/articles/https/).
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ Finally, if you run Docker on a server, it is recommended to run
|
|||
exclusively Docker in the server, and move all other services within
|
||||
containers controlled by Docker. Of course, it is fine to keep your
|
||||
favorite admin tools (probably at least an SSH server), as well as
|
||||
existing monitoring/supervision processes (e.g. NRPE, collectd, etc).
|
||||
existing monitoring/supervision processes (e.g., NRPE, collectd, etc).
|
||||
|
||||
## Linux Kernel Capabilities
|
||||
|
||||
|
|
@ -154,8 +154,8 @@ This means a lot for container security; let's see why!
|
|||
|
||||
Your average server (bare metal or virtual machine) needs to run a bunch
|
||||
of processes as root. Those typically include SSH, cron, syslogd;
|
||||
hardware management tools (to e.g. load modules), network configuration
|
||||
tools (to handle e.g. DHCP, WPA, or VPNs), and much more. A container is
|
||||
hardware management tools (e.g., load modules), network configuration
|
||||
tools (e.g., to handle DHCP, WPA, or VPNs), and much more. A container is
|
||||
very different, because almost all of those tasks are handled by the
|
||||
infrastructure around the container:
|
||||
|
||||
|
|
@ -232,7 +232,7 @@ harden a Docker host. Here are a few examples.
|
|||
mechanism.
|
||||
|
||||
Just like there are many third-party tools to augment Docker containers
|
||||
with e.g. special network topologies or shared filesystems, you can
|
||||
with e.g., special network topologies or shared filesystems, you can
|
||||
expect to see tools to harden existing Docker containers without
|
||||
affecting Docker's core.
|
||||
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ something like this
|
|||
ok github.com/dotcloud/docker/utils 0.017s
|
||||
|
||||
If $TESTFLAGS is set in the environment, it is passed as extra arguments
|
||||
to `go test`. You can use this to select certain tests to run, e.g.
|
||||
to `go test`. You can use this to select certain tests to run, e.g.,
|
||||
|
||||
$ TESTFLAGS=`-run \^TestBuild\$` make test
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ will need to install it. And this is a little more difficult on
|
|||
Rackspace.
|
||||
|
||||
Rackspace boots their servers using grub's `menu.lst`
|
||||
and does not like non `virtual` packages (e.g. Xen compatible)
|
||||
and does not like non `virtual` packages (e.g., Xen compatible)
|
||||
kernels there, although they do work. This results in
|
||||
`update-grub` not having the expected result, and
|
||||
you will need to set the kernel manually.
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ List containers (/containers/json):
|
|||
|
||||
Start containers (/containers/<id>/start):
|
||||
|
||||
- You can now pass host-specific configuration (e.g. bind mounts) in
|
||||
- You can now pass host-specific configuration (e.g., bind mounts) in
|
||||
the POST body for start calls
|
||||
|
||||
## v1.2
|
||||
|
|
|
|||
|
|
@ -605,8 +605,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"centos",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":""
|
||||
|
|
@ -935,7 +935,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -612,8 +612,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"centos",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":""
|
||||
|
|
@ -946,7 +946,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps\_args** – ps arguments to use (eg. aux)
|
||||
- **ps\_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -530,7 +530,7 @@ Attach to the container `id`
|
|||
|
||||
`STREAM_TYPE` can be:
|
||||
|
||||
- 0: stdin (will be writen on stdout)
|
||||
- 0: stdin (will be written on stdout)
|
||||
- 1: stdout
|
||||
- 2: stderr
|
||||
|
||||
|
|
@ -1181,7 +1181,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps_args** – ps arguments to use (eg. aux)
|
||||
- **ps_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -570,7 +570,7 @@ Attach to the container `id`
|
|||
|
||||
`STREAM_TYPE` can be:
|
||||
|
||||
- 0: stdin (will be writen on stdout)
|
||||
- 0: stdin (will be written on stdout)
|
||||
- 1: stdout
|
||||
- 2: stderr
|
||||
|
||||
|
|
@ -791,8 +791,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"base",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":"",
|
||||
|
|
@ -1223,7 +1223,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps_args** – ps arguments to use (eg. aux)
|
||||
- **ps_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -611,7 +611,7 @@ Attach to the container `id`
|
|||
|
||||
`STREAM_TYPE` can be:
|
||||
|
||||
- 0: stdin (will be writen on stdout)
|
||||
- 0: stdin (will be written on stdout)
|
||||
- 1: stdout
|
||||
- 2: stderr
|
||||
|
||||
|
|
@ -865,8 +865,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"base",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":"",
|
||||
|
|
@ -1301,7 +1301,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps_args** – ps arguments to use (eg. aux)
|
||||
- **ps_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -613,7 +613,7 @@ Attach to the container `id`
|
|||
|
||||
`STREAM_TYPE` can be:
|
||||
|
||||
- 0: stdin (will be writen on stdout)
|
||||
- 0: stdin (will be written on stdout)
|
||||
- 1: stdout
|
||||
- 2: stderr
|
||||
|
||||
|
|
@ -867,8 +867,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"base",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":"",
|
||||
|
|
@ -1304,7 +1304,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -628,8 +628,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"centos",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":""
|
||||
|
|
@ -959,7 +959,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -678,8 +678,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"centos",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":""
|
||||
|
|
@ -1009,7 +1009,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps_args** – ps arguments to use (eg. aux)
|
||||
- **ps_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -724,8 +724,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"centos",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":"",
|
||||
|
|
@ -1055,7 +1055,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps_args** – ps arguments to use (eg. aux)
|
||||
- **ps_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -725,8 +725,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"centos",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":"",
|
||||
|
|
@ -1067,7 +1067,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps_args** – ps arguments to use (eg. aux)
|
||||
- **ps_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -558,7 +558,7 @@ Attach to the container `id`
|
|||
|
||||
`STREAM_TYPE` can be:
|
||||
|
||||
- 0: stdin (will be writen on stdout)
|
||||
- 0: stdin (will be written on stdout)
|
||||
- 1: stdout
|
||||
- 2: stderr
|
||||
|
||||
|
|
@ -832,8 +832,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"base",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":"",
|
||||
|
|
@ -1163,7 +1163,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps_args** – ps arguments to use (eg. aux)
|
||||
- **ps_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -507,7 +507,7 @@ Attach to the container `id`
|
|||
|
||||
`STREAM_TYPE` can be:
|
||||
|
||||
- 0: stdin (will be writen on stdout)
|
||||
- 0: stdin (will be written on stdout)
|
||||
- 1: stdout
|
||||
- 2: stderr
|
||||
|
||||
|
|
@ -751,8 +751,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"base",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":"",
|
||||
|
|
@ -1112,7 +1112,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
- **run** – config automatically applied when the image is run.
|
||||
(ex: {"Cmd": ["cat", "/world"], "PortSpecs":["22"]})
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps_args** – ps arguments to use (eg. aux)
|
||||
- **ps_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -549,7 +549,7 @@ Attach to the container `id`
|
|||
|
||||
`STREAM_TYPE` can be:
|
||||
|
||||
- 0: stdin (will be writen on stdout)
|
||||
- 0: stdin (will be written on stdout)
|
||||
- 1: stdout
|
||||
- 2: stderr
|
||||
|
||||
|
|
@ -793,8 +793,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"base",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":"",
|
||||
|
|
@ -1157,7 +1157,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
- **run** – config automatically applied when the image is run.
|
||||
(ex: {"Cmd": ["cat", "/world"], "PortSpecs":["22"]})
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ List processes running inside the container `id`
|
|||
|
||||
|
||||
|
||||
- **ps_args** – ps arguments to use (eg. aux)
|
||||
- **ps_args** – ps arguments to use (e.g., aux)
|
||||
|
||||
Status Codes:
|
||||
|
||||
|
|
@ -553,7 +553,7 @@ Attach to the container `id`
|
|||
|
||||
`STREAM_TYPE` can be:
|
||||
|
||||
- 0: stdin (will be writen on stdout)
|
||||
- 0: stdin (will be written on stdout)
|
||||
- 1: stdout
|
||||
- 2: stderr
|
||||
|
||||
|
|
@ -797,8 +797,8 @@ Return low-level information on the image `name`
|
|||
"OpenStdin":true,
|
||||
"StdinOnce":false,
|
||||
"Env":null,
|
||||
"Cmd": ["/bin/bash"]
|
||||
,"Dns":null,
|
||||
"Cmd": ["/bin/bash"],
|
||||
"Dns":null,
|
||||
"Image":"base",
|
||||
"Volumes":null,
|
||||
"VolumesFrom":"",
|
||||
|
|
@ -1194,7 +1194,7 @@ Create a new image from a container's changes
|
|||
- **repo** – repository
|
||||
- **tag** – tag
|
||||
- **m** – commit message
|
||||
- **author** – author (eg. "John Hannibal Smith
|
||||
- **author** – author (e.g., "John Hannibal Smith
|
||||
<[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
|
||||
|
||||
Status Codes:
|
||||
|
|
|
|||
|
|
@ -77,11 +77,11 @@ grasp the context, here are some examples of registries:
|
|||
> - local mount point;
|
||||
> - remote docker addressed through SSH.
|
||||
|
||||
The latter would only require two new commands in docker, e.g.
|
||||
The latter would only require two new commands in docker, e.g.,
|
||||
`registryget` and `registryput`,
|
||||
wrapping access to the local filesystem (and optionally doing
|
||||
consistency checks). Authentication and authorization are then delegated
|
||||
to SSH (e.g. with public keys).
|
||||
to SSH (e.g., with public keys).
|
||||
|
||||
### Docker
|
||||
|
||||
|
|
|
|||
|
|
@ -62,10 +62,10 @@ grasp the context, here are some examples of registries:
|
|||
> - local mount point;
|
||||
> - remote docker addressed through SSH.
|
||||
|
||||
The latter would only require two new commands in docker, e.g.
|
||||
The latter would only require two new commands in docker, e.g.,
|
||||
`registryget` and `registryput`, wrapping access to the local filesystem
|
||||
(and optionally doing consistency checks). Authentication and authorization
|
||||
are then delegated to SSH (e.g. with public keys).
|
||||
are then delegated to SSH (e.g., with public keys).
|
||||
|
||||
# Endpoints
|
||||
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ schema.
|
|||
|
||||
Create a new image from a container's changes
|
||||
|
||||
-a, --author="" Author (eg. "John Hannibal Smith <hannibal@a-team.com>")
|
||||
-a, --author="" Author (e.g., "John Hannibal Smith <hannibal@a-team.com>")
|
||||
-m, --message="" Commit message
|
||||
|
||||
It can be useful to commit a container's file changes or settings into a
|
||||
|
|
@ -518,7 +518,7 @@ by default.
|
|||
### Filtering
|
||||
|
||||
The filtering flag (`-f` or `--filter`) format is of "key=value". If there are more
|
||||
than one filter, then pass multiple flags (e.g. `--filter "foo=bar" --filter "bif=baz"`)
|
||||
than one filter, then pass multiple flags (e.g., `--filter "foo=bar" --filter "bif=baz"`)
|
||||
|
||||
Current filters:
|
||||
* dangling (boolean - true or false)
|
||||
|
|
@ -929,7 +929,7 @@ removed before the image is removed.
|
|||
--sig-proxy=true Proxify received signals to the process (even in non-tty mode). SIGCHLD is not proxied.
|
||||
-t, --tty=false Allocate a pseudo-tty
|
||||
-u, --user="" Username or UID
|
||||
-v, --volume=[] Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)
|
||||
-v, --volume=[] Bind mount a volume (e.g., from the host: -v /host:/container, from docker: -v /container)
|
||||
--volumes-from=[] Mount volumes from the specified container(s)
|
||||
-w, --workdir="" Working directory inside the container
|
||||
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ server.
|
|||
Images can be associated with a repository (or multiple) by giving them
|
||||
an image name using one of three different commands:
|
||||
|
||||
1. At build time (e.g. `sudo docker build -t IMAGENAME`),
|
||||
2. When committing a container (e.g.
|
||||
1. At build time (e.g., `sudo docker build -t IMAGENAME`),
|
||||
2. When committing a container (e.g.,
|
||||
`sudo docker commit CONTAINERID IMAGENAME`) or
|
||||
3. When tagging an image id with an image name (e.g.
|
||||
3. When tagging an image id with an image name (e.g.,
|
||||
`sudo docker tag IMAGEID IMAGENAME`).
|
||||
|
||||
A Fully Qualified Image Name (FQIN) can be made up of 3 parts:
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче