Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
| ... | ... |
@@ -1287,7 +1287,7 @@ by another client (#15489) |
| 1287 | 1287 |
#### Security |
| 1288 | 1288 |
- Fix tar breakout vulnerability |
| 1289 | 1289 |
* Extractions are now sandboxed chroot |
| 1290 |
-- Security options are no longer comitted to images |
|
| 1290 |
+- Security options are no longer committed to images |
|
| 1291 | 1291 |
|
| 1292 | 1292 |
#### Runtime |
| 1293 | 1293 |
- Fix deadlock in `docker ps -f exited=1` |
| ... | ... |
@@ -123,7 +123,7 @@ However, there might be a way to implement that feature *on top of* Docker. |
| 123 | 123 |
group is for contributors and other people contributing to the Docker project. |
| 124 | 124 |
You can join them without a google account by sending an email to |
| 125 | 125 |
<a href="mailto:docker-dev+subscribe@googlegroups.com">docker-dev+subscribe@googlegroups.com</a>. |
| 126 |
- After receiving the join-request message, you can simply reply to that to confirm the subscribtion. |
|
| 126 |
+ After receiving the join-request message, you can simply reply to that to confirm the subscription. |
|
| 127 | 127 |
</td> |
| 128 | 128 |
</tr> |
| 129 | 129 |
<tr> |
| ... | ... |
@@ -4031,7 +4031,7 @@ paths: |
| 4031 | 4031 |
post: |
| 4032 | 4032 |
summary: "Build an image" |
| 4033 | 4033 |
description: | |
| 4034 |
- Build an image from a tar achive with a Dockerfile in it. |
|
| 4034 |
+ Build an image from a tar archive with a Dockerfile in it. |
|
| 4035 | 4035 |
|
| 4036 | 4036 |
The Dockerfile specifies how the image is built from the tar archive. It is typically in the archive's root, but can be at a different path or have a different name by specifying the `dockerfile` parameter. [See the Dockerfile reference for more information](https://docs.docker.com/engine/reference/builder/). |
| 4037 | 4037 |
|
| ... | ... |
@@ -54,7 +54,7 @@ type NodeDescription struct {
|
| 54 | 54 |
Engine EngineDescription `json:",omitempty"` |
| 55 | 55 |
} |
| 56 | 56 |
|
| 57 |
-// Platform represents the platfrom (Arch/OS). |
|
| 57 |
+// Platform represents the platform (Arch/OS). |
|
| 58 | 58 |
type Platform struct {
|
| 59 | 59 |
Architecture string `json:",omitempty"` |
| 60 | 60 |
OS string `json:",omitempty"` |
| ... | ... |
@@ -410,7 +410,7 @@ func (b *Builder) processImageFrom(img builder.Image) error {
|
| 410 | 410 |
fmt.Fprintf(b.Stderr, "# Executing %d build %s...\n", nTriggers, word) |
| 411 | 411 |
} |
| 412 | 412 |
|
| 413 |
- // Copy the ONBUILD triggers, and remove them from the config, since the config will be comitted. |
|
| 413 |
+ // Copy the ONBUILD triggers, and remove them from the config, since the config will be committed. |
|
| 414 | 414 |
onBuildTriggers := b.runConfig.OnBuild |
| 415 | 415 |
b.runConfig.OnBuild = []string{}
|
| 416 | 416 |
|
| ... | ... |
@@ -47,7 +47,7 @@ func runLogout(dockerCli *command.DockerCli, serverAddress string) error {
|
| 47 | 47 |
) |
| 48 | 48 |
if !isDefaultRegistry {
|
| 49 | 49 |
hostnameAddress = registry.ConvertToHostname(serverAddress) |
| 50 |
- // the tries below are kept for backward compatibily where a user could have |
|
| 50 |
+ // the tries below are kept for backward compatibility where a user could have |
|
| 51 | 51 |
// saved the registry in one of the following format. |
| 52 | 52 |
regsToTry = append(regsToTry, hostnameAddress, "http://"+hostnameAddress, "https://"+hostnameAddress) |
| 53 | 53 |
} |
| ... | ... |
@@ -46,7 +46,7 @@ func newJoinTokenCommand(dockerCli *command.DockerCli) *cobra.Command {
|
| 46 | 46 |
return err |
| 47 | 47 |
} |
| 48 | 48 |
if !quiet {
|
| 49 |
- fmt.Fprintf(dockerCli.Out(), "Succesfully rotated %s join token.\n\n", args[0]) |
|
| 49 |
+ fmt.Fprintf(dockerCli.Out(), "Successfully rotated %s join token.\n\n", args[0]) |
|
| 50 | 50 |
} |
| 51 | 51 |
} |
| 52 | 52 |
|
| ... | ... |
@@ -64,7 +64,7 @@ func (c *memoryStore) First(filter StoreFilter) *Container {
|
| 64 | 64 |
} |
| 65 | 65 |
|
| 66 | 66 |
// ApplyAll calls the reducer function with every container in the store. |
| 67 |
-// This operation is asyncronous in the memory store. |
|
| 67 |
+// This operation is asynchronous in the memory store. |
|
| 68 | 68 |
// NOTE: Modifications to the store MUST NOT be done by the StoreReducer. |
| 69 | 69 |
func (c *memoryStore) ApplyAll(apply StoreReducer) {
|
| 70 | 70 |
wg := new(sync.WaitGroup) |
| ... | ... |
@@ -10,5 +10,5 @@ Compile |
| 10 | 10 |
## inside build container |
| 11 | 11 |
$ go build contrib/docker-device-tool/device_tool.go |
| 12 | 12 |
|
| 13 |
- # if devicemapper version is old and compliation fails, compile with `libdm_no_deferred_remove` tag |
|
| 13 |
+ # if devicemapper version is old and compilation fails, compile with `libdm_no_deferred_remove` tag |
|
| 14 | 14 |
$ go build -tags libdm_no_deferred_remove contrib/docker-device-tool/device_tool.go |
| ... | ... |
@@ -19,7 +19,7 @@ func validateMounts(mounts []api.Mount) error {
|
| 19 | 19 |
// The checks on abs paths are required due to the container API confusing |
| 20 | 20 |
// volume mounts as bind mounts when the source is absolute (and vice-versa) |
| 21 | 21 |
// See #25253 |
| 22 |
- // TODO: This is probably not neccessary once #22373 is merged |
|
| 22 |
+ // TODO: This is probably not necessary once #22373 is merged |
|
| 23 | 23 |
case api.MountTypeBind: |
| 24 | 24 |
if !filepath.IsAbs(mount.Source) {
|
| 25 | 25 |
return fmt.Errorf("invalid bind mount source, must be an absolute path: %s", mount.Source)
|
| ... | ... |
@@ -63,7 +63,7 @@ func (daemon *Daemon) StateChanged(id string, e libcontainerd.StateInfo) error {
|
| 63 | 63 |
err := <-wait |
| 64 | 64 |
if err == nil {
|
| 65 | 65 |
if err = daemon.containerStart(c, "", "", false); err != nil {
|
| 66 |
- logrus.Debugf("failed to restart contianer: %+v", err)
|
|
| 66 |
+ logrus.Debugf("failed to restart container: %+v", err)
|
|
| 67 | 67 |
} |
| 68 | 68 |
} |
| 69 | 69 |
if err != nil {
|
| ... | ... |
@@ -190,7 +190,7 @@ func (daemon *Daemon) registerMountPoints(container *container.Container, hostCo |
| 190 | 190 |
mp.Name = v.Name() |
| 191 | 191 |
mp.Driver = v.DriverName() |
| 192 | 192 |
|
| 193 |
- // only use the cached path here since getting the path is not neccessary right now and calling `Path()` may be slow |
|
| 193 |
+ // only use the cached path here since getting the path is not necessary right now and calling `Path()` may be slow |
|
| 194 | 194 |
if cv, ok := v.(interface {
|
| 195 | 195 |
CachedPath() string |
| 196 | 196 |
}); ok {
|
| ... | ... |
@@ -1273,7 +1273,7 @@ Server containers or Hyper-V containers. For Hyper-V containers, the engine |
| 1273 | 1273 |
is, for architectural reasons, unable to create the directory if it does not |
| 1274 | 1274 |
previously exist. For Windows Server containers, the directory is created |
| 1275 | 1275 |
if it does not exist. Hence, for consistency between Windows Server and |
| 1276 |
-Hyper-V containers, it is strongly recommended to include an explict instruction |
|
| 1276 |
+Hyper-V containers, it is strongly recommended to include an explicit instruction |
|
| 1277 | 1277 |
to create the directory in the Dockerfile. For example: |
| 1278 | 1278 |
|
| 1279 | 1279 |
# escape=` |
| ... | ... |
@@ -58,7 +58,7 @@ Use the `--rotate` flag to generate a new join token for the specified role: |
| 58 | 58 |
|
| 59 | 59 |
```bash |
| 60 | 60 |
$ docker swarm join-token --rotate worker |
| 61 |
-Succesfully rotated worker join token. |
|
| 61 |
+Successfully rotated worker join token. |
|
| 62 | 62 |
|
| 63 | 63 |
To add a worker to this swarm, run the following command: |
| 64 | 64 |
|
| ... | ... |
@@ -85,7 +85,7 @@ if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; the |
| 85 | 85 |
echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" |
| 86 | 86 |
echo "# GITCOMMIT = $GITCOMMIT" |
| 87 | 87 |
echo "# The version you are building is listed as unsupported because" |
| 88 |
- echo "# there are some files in the git repository that are in an uncommited state." |
|
| 88 |
+ echo "# there are some files in the git repository that are in an uncommitted state." |
|
| 89 | 89 |
echo "# Commit these changes, or add to .gitignore to remove the -unsupported from the version." |
| 90 | 90 |
echo "# Here is the current list:" |
| 91 | 91 |
git status --porcelain --untracked-files=no |
| ... | ... |
@@ -206,7 +206,7 @@ release_build() {
|
| 206 | 206 |
s3Os=Linux |
| 207 | 207 |
;; |
| 208 | 208 |
windows) |
| 209 |
- # this is windows use the .zip and .exe extentions for the files. |
|
| 209 |
+ # this is windows use the .zip and .exe extensions for the files. |
|
| 210 | 210 |
s3Os=Windows |
| 211 | 211 |
zipExt=".zip" |
| 212 | 212 |
binaryExt=".exe" |
| ... | ... |
@@ -79,7 +79,7 @@ This specification uses the following terms: |
| 79 | 79 |
<code>sha256:a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9</code>. |
| 80 | 80 |
Since the configuration JSON that gets hashed references hashes of each |
| 81 | 81 |
layer in the image, this formulation of the ImageID makes images |
| 82 |
- content-addresable. |
|
| 82 |
+ content-addressable. |
|
| 83 | 83 |
</dd> |
| 84 | 84 |
<dt> |
| 85 | 85 |
Tag |
| ... | ... |
@@ -79,7 +79,7 @@ This specification uses the following terms: |
| 79 | 79 |
<code>sha256:a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9</code>. |
| 80 | 80 |
Since the configuration JSON that gets hashed references hashes of each |
| 81 | 81 |
layer in the image, this formulation of the ImageID makes images |
| 82 |
- content-addresable. |
|
| 82 |
+ content-addressable. |
|
| 83 | 83 |
</dd> |
| 84 | 84 |
<dt> |
| 85 | 85 |
Tag |
| ... | ... |
@@ -268,7 +268,7 @@ func (s *DockerSuite) TestCpToSymlinkToDirectory(c *check.C) {
|
| 268 | 268 |
|
| 269 | 269 |
containerID := strings.TrimSpace(out) |
| 270 | 270 |
|
| 271 |
- // Create a temp directory to hold a test file nested in a direcotry. |
|
| 271 |
+ // Create a temp directory to hold a test file nested in a directory. |
|
| 272 | 272 |
testDir, err := ioutil.TempDir("", "test-cp-to-symlink-to-dir-")
|
| 273 | 273 |
c.Assert(err, checker.IsNil) |
| 274 | 274 |
defer os.RemoveAll(testDir) |
| ... | ... |
@@ -4201,7 +4201,7 @@ func (s *DockerSuite) TestRunVolumesMountedAsSlave(c *check.C) {
|
| 4201 | 4201 |
} |
| 4202 | 4202 |
|
| 4203 | 4203 |
// Prepare a source directory with file in it. We will bind mount this |
| 4204 |
- // direcotry and see if file shows up. |
|
| 4204 |
+ // directory and see if file shows up. |
|
| 4205 | 4205 |
tmpDir2, err := ioutil.TempDir("", "volume-source2")
|
| 4206 | 4206 |
if err != nil {
|
| 4207 | 4207 |
c.Fatal(err) |
| ... | ... |
@@ -151,7 +151,7 @@ two memory nodes. |
| 151 | 151 |
Limit the containers Real Time CPU usage. This flag tells the kernel to limit the amount of time in a given CPU period Real Time tasks may consume. Ex: |
| 152 | 152 |
Period of 1,000,000us and Runtime of 950,000us means that this container could consume 95% of available CPU and leave the remaining 5% to normal priority tasks. |
| 153 | 153 |
|
| 154 |
- The sum of all runtimes across containers cannot exceed the amount alotted to the parent cgroup. |
|
| 154 |
+ The sum of all runtimes across containers cannot exceed the amount allotted to the parent cgroup. |
|
| 155 | 155 |
|
| 156 | 156 |
**--device**=[] |
| 157 | 157 |
Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm) |
| ... | ... |
@@ -205,7 +205,7 @@ to the quota you specify. |
| 205 | 205 |
Limit the containers Real Time CPU usage. This flag tells the kernel to limit the amount of time in a given CPU period Real Time tasks may consume. Ex: |
| 206 | 206 |
Period of 1,000,000us and Runtime of 950,000us means that this container could consume 95% of available CPU and leave the remaining 5% to normal priority tasks. |
| 207 | 207 |
|
| 208 |
- The sum of all runtimes across containers cannot exceed the amount alotted to the parent cgroup. |
|
| 208 |
+ The sum of all runtimes across containers cannot exceed the amount allotted to the parent cgroup. |
|
| 209 | 209 |
|
| 210 | 210 |
**-d**, **--detach**=*true*|*false* |
| 211 | 211 |
Detached mode: run the container in the background and print the new container ID. The default is *false*. |
| ... | ... |
@@ -62,7 +62,7 @@ a running container with kernel memory initialized. |
| 62 | 62 |
Limit the containers Real Time CPU usage. This flag tells the kernel to limit the amount of time in a given CPU period Real Time tasks may consume. Ex: |
| 63 | 63 |
Period of 1,000,000us and Runtime of 950,000us means that this container could consume 95% of available CPU and leave the remaining 5% to normal priority tasks. |
| 64 | 64 |
|
| 65 |
- The sum of all runtimes across containers cannot exceed the amount alotted to the parent cgroup. |
|
| 65 |
+ The sum of all runtimes across containers cannot exceed the amount allotted to the parent cgroup. |
|
| 66 | 66 |
|
| 67 | 67 |
**--cpuset-cpus**="" |
| 68 | 68 |
CPUs in which to allow execution (0-3, 0,1) |
| ... | ... |
@@ -308,7 +308,7 @@ func (ta *tarAppender) addTarFile(path, name string) error {
|
| 308 | 308 |
} |
| 309 | 309 |
|
| 310 | 310 |
// if it's not a directory and has more than 1 link, |
| 311 |
- // it's hardlinked, so set the type flag accordingly |
|
| 311 |
+ // it's hard linked, so set the type flag accordingly |
|
| 312 | 312 |
if !fi.IsDir() && hasHardlinks(fi) {
|
| 313 | 313 |
// a link should have a name that it links too |
| 314 | 314 |
// and that linked name should be first in the tar archive |