| ... | ... |
@@ -471,7 +471,7 @@ func TestGetContainersTop(t *testing.T) {
|
| 471 | 471 |
} |
| 472 | 472 |
defer runtime.Destroy(container) |
| 473 | 473 |
defer func() {
|
| 474 |
- // Make sure the process dies before destorying runtime |
|
| 474 |
+ // Make sure the process dies before destroying runtime |
|
| 475 | 475 |
container.stdin.Close() |
| 476 | 476 |
container.WaitTimeout(2 * time.Second) |
| 477 | 477 |
}() |
| ... | ... |
@@ -563,7 +563,7 @@ func TestGetContainersByName(t *testing.T) {
|
| 563 | 563 |
t.Fatal(err) |
| 564 | 564 |
} |
| 565 | 565 |
if outContainer.ID != container.ID {
|
| 566 |
- t.Fatalf("Wrong containers retrieved. Expected %s, recieved %s", container.ID, outContainer.ID)
|
|
| 566 |
+ t.Fatalf("Wrong containers retrieved. Expected %s, received %s", container.ID, outContainer.ID)
|
|
| 567 | 567 |
} |
| 568 | 568 |
} |
| 569 | 569 |
|
| ... | ... |
@@ -802,7 +802,7 @@ func TestPostContainersStart(t *testing.T) {
|
| 802 | 802 |
|
| 803 | 803 |
r = httptest.NewRecorder() |
| 804 | 804 |
if err = postContainersStart(srv, APIVERSION, r, req, map[string]string{"name": container.ID}); err == nil {
|
| 805 |
- t.Fatalf("A running containter should be able to be started")
|
|
| 805 |
+ t.Fatalf("A running container should be able to be started")
|
|
| 806 | 806 |
} |
| 807 | 807 |
|
| 808 | 808 |
if err := container.Kill(); err != nil {
|
| ... | ... |
@@ -926,7 +926,7 @@ func TestPostContainersAttach(t *testing.T) {
|
| 926 | 926 |
stdin, stdinPipe := io.Pipe() |
| 927 | 927 |
stdout, stdoutPipe := io.Pipe() |
| 928 | 928 |
|
| 929 |
- // Try to avoid the timeoout in destroy. Best effort, don't check error |
|
| 929 |
+ // Try to avoid the timeout in destroy. Best effort, don't check error |
|
| 930 | 930 |
defer func() {
|
| 931 | 931 |
closeWrap(stdin, stdinPipe, stdout, stdoutPipe) |
| 932 | 932 |
container.Kill() |
| ... | ... |
@@ -982,7 +982,7 @@ func TestPostContainersAttach(t *testing.T) {
|
| 982 | 982 |
t.Fatalf("/bin/cat is not running after closing stdin")
|
| 983 | 983 |
} |
| 984 | 984 |
|
| 985 |
- // Try to avoid the timeoout in destroy. Best effort, don't check error |
|
| 985 |
+ // Try to avoid the timeout in destroy. Best effort, don't check error |
|
| 986 | 986 |
cStdin, _ := container.StdinPipe() |
| 987 | 987 |
cStdin.Close() |
| 988 | 988 |
container.Wait() |
| ... | ... |
@@ -98,7 +98,7 @@ func TarFilter(path string, compression Compression, filter []string) (io.Reader |
| 98 | 98 |
|
| 99 | 99 |
// Untar reads a stream of bytes from `archive`, parses it as a tar archive, |
| 100 | 100 |
// and unpacks it into the directory at `path`. |
| 101 |
-// The archive may be compressed with one of the following algorithgms: |
|
| 101 |
+// The archive may be compressed with one of the following algorithms: |
|
| 102 | 102 |
// identity (uncompressed), gzip, bzip2, xz. |
| 103 | 103 |
// FIXME: specify behavior when target path exists vs. doesn't exist. |
| 104 | 104 |
func Untar(archive io.Reader, path string) error {
|
| ... | ... |
@@ -509,7 +509,7 @@ func (b *buildFile) Build(context io.Reader) (string, error) {
|
| 509 | 509 |
fmt.Fprintf(b.out, "Successfully built %s\n", utils.TruncateID(b.image)) |
| 510 | 510 |
return b.image, nil |
| 511 | 511 |
} |
| 512 |
- return "", fmt.Errorf("An error occured during the build\n")
|
|
| 512 |
+ return "", fmt.Errorf("An error occurred during the build\n")
|
|
| 513 | 513 |
} |
| 514 | 514 |
|
| 515 | 515 |
func NewBuildFile(srv *Server, out io.Writer, verbose, utilizeCache bool) BuildFile {
|
| ... | ... |
@@ -194,7 +194,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
|
| 194 | 194 |
} |
| 195 | 195 |
var body io.Reader |
| 196 | 196 |
// Setup an upload progress bar |
| 197 |
- // FIXME: ProgressReader shouldn't be this annoyning to use |
|
| 197 |
+ // FIXME: ProgressReader shouldn't be this annoying to use |
|
| 198 | 198 |
if context != nil {
|
| 199 | 199 |
sf := utils.NewStreamFormatter(false) |
| 200 | 200 |
body = utils.ProgressReader(ioutil.NopCloser(context), 0, cli.err, sf.FormatProgress("", "Uploading context", "%v bytes%0.0s%0.0s"), sf, true)
|
| ... | ... |
@@ -373,7 +373,7 @@ func TestAttachDisconnect(t *testing.T) {
|
| 373 | 373 |
t.Fatalf("/bin/cat is not running after closing stdin")
|
| 374 | 374 |
} |
| 375 | 375 |
|
| 376 |
- // Try to avoid the timeoout in destroy. Best effort, don't check error |
|
| 376 |
+ // Try to avoid the timeout in destroy. Best effort, don't check error |
|
| 377 | 377 |
cStdin, _ := container.StdinPipe() |
| 378 | 378 |
cStdin.Close() |
| 379 | 379 |
container.Wait() |
| ... | ... |
@@ -186,7 +186,7 @@ func TestDiff(t *testing.T) {
|
| 186 | 186 |
} |
| 187 | 187 |
} |
| 188 | 188 |
|
| 189 |
- // Create a new containere |
|
| 189 |
+ // Create a new container |
|
| 190 | 190 |
container3, _, _ := mkContainer(runtime, []string{"_", "rm", "/bin/httpd"}, t)
|
| 191 | 191 |
defer runtime.Destroy(container3) |
| 192 | 192 |
|
| ... | ... |
@@ -351,10 +351,10 @@ func TestStart(t *testing.T) {
|
| 351 | 351 |
t.Errorf("Container should be running")
|
| 352 | 352 |
} |
| 353 | 353 |
if err := container.Start(hostConfig); err == nil {
|
| 354 |
- t.Fatalf("A running containter should be able to be started")
|
|
| 354 |
+ t.Fatalf("A running container should be able to be started")
|
|
| 355 | 355 |
} |
| 356 | 356 |
|
| 357 |
- // Try to avoid the timeoout in destroy. Best effort, don't check error |
|
| 357 |
+ // Try to avoid the timeout in destroy. Best effort, don't check error |
|
| 358 | 358 |
cStdin.Close() |
| 359 | 359 |
container.WaitTimeout(2 * time.Second) |
| 360 | 360 |
} |
| ... | ... |
@@ -764,7 +764,7 @@ func TestUser(t *testing.T) {
|
| 764 | 764 |
Image: GetTestImage(runtime).ID, |
| 765 | 765 |
Cmd: []string{"id"},
|
| 766 | 766 |
|
| 767 |
- User: "unkownuser", |
|
| 767 |
+ User: "unknownuser", |
|
| 768 | 768 |
}, |
| 769 | 769 |
) |
| 770 | 770 |
if err != nil {
|
| ... | ... |
@@ -37,7 +37,7 @@ func main() {
|
| 37 | 37 |
flag.Var(&flHosts, "H", "tcp://host:port to bind/connect to or unix://path/to/socket to use") |
| 38 | 38 |
flag.Parse() |
| 39 | 39 |
if len(flHosts) > 1 {
|
| 40 |
- flHosts = flHosts[1:] //trick to display a nice defaul value in the usage |
|
| 40 |
+ flHosts = flHosts[1:] //trick to display a nice default value in the usage |
|
| 41 | 41 |
} |
| 42 | 42 |
for i, flHost := range flHosts {
|
| 43 | 43 |
flHosts[i] = utils.ParseHost(docker.DEFAULTHTTPHOST, docker.DEFAULTHTTPPORT, flHost) |
| ... | ... |
@@ -28,7 +28,7 @@ Usage |
| 28 | 28 |
Working using GitHub's file editor |
| 29 | 29 |
---------------------------------- |
| 30 | 30 |
Alternatively, for small changes and typo's you might want to use GitHub's built in file editor. It allows |
| 31 |
-you to preview your changes right online. Just be carefull not to create many commits. |
|
| 31 |
+you to preview your changes right online. Just be careful not to create many commits. |
|
| 32 | 32 |
|
| 33 | 33 |
Images |
| 34 | 34 |
------ |
| ... | ... |
@@ -26,7 +26,7 @@ Docker Remote API |
| 26 | 26 |
2. Versions |
| 27 | 27 |
=========== |
| 28 | 28 |
|
| 29 |
-The current verson of the API is 1.4 |
|
| 29 |
+The current version of the API is 1.4 |
|
| 30 | 30 |
|
| 31 | 31 |
Calling /images/<name>/insert is the same as calling |
| 32 | 32 |
/v1.4/images/<name>/insert |
| ... | ... |
@@ -107,7 +107,7 @@ The client should send it's authConfig as POST on each call of |
| 107 | 107 |
Only checks the configuration but doesn't store it on the server |
| 108 | 108 |
|
| 109 | 109 |
Deleting an image is now improved, will only untag the image if it |
| 110 |
- has chidren and remove all the untagged parents if has any. |
|
| 110 |
+ has children and remove all the untagged parents if has any. |
|
| 111 | 111 |
|
| 112 | 112 |
.. http:post:: /images/<name>/delete |
| 113 | 113 |
|
| ... | ... |
@@ -154,7 +154,7 @@ API (pulling repository foo/bar): |
| 154 | 154 |
|
| 155 | 155 |
.. note:: |
| 156 | 156 |
|
| 157 |
- **It’s possible not to use the Index at all!** In this case, a deployed version of the Registry is deployed to store and serve images. Those images are not authentified and the security is not guaranteed. |
|
| 157 |
+ **It’s possible not to use the Index at all!** In this case, a deployed version of the Registry is deployed to store and serve images. Those images are not authenticated and the security is not guaranteed. |
|
| 158 | 158 |
|
| 159 | 159 |
.. note:: |
| 160 | 160 |
|
| ... | ... |
@@ -51,7 +51,7 @@ source_suffix = '.rst' |
| 51 | 51 |
# The encoding of source files. |
| 52 | 52 |
#source_encoding = 'utf-8-sig' |
| 53 | 53 |
|
| 54 |
-#disable the parmalinks on headers, I find them really annoying |
|
| 54 |
+#disable the permalinks on headers, I find them really annoying |
|
| 55 | 55 |
html_add_permalinks = None |
| 56 | 56 |
|
| 57 | 57 |
|
| ... | ... |
@@ -1,5 +1,5 @@ |
| 1 | 1 |
:title: Contribution Guidelines |
| 2 |
-:description: Contribution guidelines: create issues, convetions, pull requests |
|
| 2 |
+:description: Contribution guidelines: create issues, conventions, pull requests |
|
| 3 | 3 |
:keywords: contributing, docker, documentation, help, guideline |
| 4 | 4 |
|
| 5 | 5 |
Contributing to Docker |
| ... | ... |
@@ -33,7 +33,7 @@ The password is 'screencast' |
| 33 | 33 |
|
| 34 | 34 |
.. code-block:: bash |
| 35 | 35 |
|
| 36 |
- # Hello! We are going to try and install openssh on a container and run it as a servic |
|
| 36 |
+ # Hello! We are going to try and install openssh on a container and run it as a service |
|
| 37 | 37 |
# let's pull ubuntu to get a base ubuntu image. |
| 38 | 38 |
$ docker pull ubuntu |
| 39 | 39 |
# I had it so it was quick |
| ... | ... |
@@ -46,7 +46,7 @@ The password is 'screencast' |
| 46 | 46 |
$ apt-get install openssh-server |
| 47 | 47 |
# ok. lets see if we can run it. |
| 48 | 48 |
$ which sshd |
| 49 |
- # we need to create priviledge separation directory |
|
| 49 |
+ # we need to create privilege separation directory |
|
| 50 | 50 |
$ mkdir /var/run/sshd |
| 51 | 51 |
$ /usr/sbin/sshd |
| 52 | 52 |
$ exit |
| ... | ... |
@@ -23,7 +23,7 @@ dependencies. |
| 23 | 23 |
commit``). |
| 24 | 24 |
|
| 25 | 25 |
Each use of ``docker`` is documented here. The features of Docker are |
| 26 |
-currently in active development, so this documention will change |
|
| 26 |
+currently in active development, so this documentation will change |
|
| 27 | 27 |
frequently. |
| 28 | 28 |
|
| 29 | 29 |
For an overview of Docker, please see the `Introduction |
| ... | ... |
@@ -10,7 +10,7 @@ Rackspace Cloud |
| 10 | 10 |
:ref:`ubuntu_linux` installation path. This version may sometimes be out of date. |
| 11 | 11 |
|
| 12 | 12 |
|
| 13 |
-Installing Docker on Ubuntu proviced by Rackspace is pretty straightforward, and you should mostly be able to follow the |
|
| 13 |
+Installing Docker on Ubuntu provided by Rackspace is pretty straightforward, and you should mostly be able to follow the |
|
| 14 | 14 |
:ref:`ubuntu_linux` installation guide. |
| 15 | 15 |
|
| 16 | 16 |
**However, there is one caveat:** |
| ... | ... |
@@ -14,7 +14,7 @@ switches the whole rootfs volume to read-write mode. |
| 14 | 14 |
Layer |
| 15 | 15 |
..... |
| 16 | 16 |
|
| 17 |
-When Docker mounts the rootfs, it starts read-only, as in a tradtional |
|
| 17 |
+When Docker mounts the rootfs, it starts read-only, as in a traditional |
|
| 18 | 18 |
Linux boot, but then, instead of changing the file system to |
| 19 | 19 |
read-write mode, it takes advantage of a `union mount |
| 20 | 20 |
<http://en.wikipedia.org/wiki/Union_mount>`_ to add a read-write file |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
:title: Working With Repositories |
| 2 | 2 |
:description: Repositories allow users to share images. |
| 3 |
-:keywords: repo, repositiores, usage, pull image, push image, image, documentation |
|
| 3 |
+:keywords: repo, repositories, usage, pull image, push image, image, documentation |
|
| 4 | 4 |
|
| 5 | 5 |
.. _working_with_the_repository: |
| 6 | 6 |
|
| ... | ... |
@@ -71,7 +71,7 @@ function completely independently from the Central Index. |
| 71 | 71 |
Find public images available on the Central Index |
| 72 | 72 |
------------------------------------------------- |
| 73 | 73 |
|
| 74 |
-Seach by name, namespace or description |
|
| 74 |
+Search by name, namespace or description |
|
| 75 | 75 |
|
| 76 | 76 |
.. code-block:: bash |
| 77 | 77 |
|
| ... | ... |
@@ -332,7 +332,7 @@ func newPortMapper() (*PortMapper, error) {
|
| 332 | 332 |
return mapper, nil |
| 333 | 333 |
} |
| 334 | 334 |
|
| 335 |
-// Port allocator: Atomatically allocate and release networking ports |
|
| 335 |
+// Port allocator: Automatically allocate and release networking ports |
|
| 336 | 336 |
type PortAllocator struct {
|
| 337 | 337 |
sync.Mutex |
| 338 | 338 |
inUse map[int]struct{}
|
| ... | ... |
@@ -385,7 +385,7 @@ func newPortAllocator() (*PortAllocator, error) {
|
| 385 | 385 |
return allocator, nil |
| 386 | 386 |
} |
| 387 | 387 |
|
| 388 |
-// IP allocator: Atomatically allocate and release networking ports |
|
| 388 |
+// IP allocator: Automatically allocate and release networking ports |
|
| 389 | 389 |
type IPAllocator struct {
|
| 390 | 390 |
network *net.IPNet |
| 391 | 391 |
queueAlloc chan allocatedIP |
| ... | ... |
@@ -425,7 +425,7 @@ func (srv *Server) pullImage(r *registry.Registry, out io.Writer, imgID, endpoin |
| 425 | 425 |
out.Write(sf.FormatProgress(utils.TruncateID(id), "Pulling", "metadata")) |
| 426 | 426 |
imgJSON, imgSize, err := r.GetRemoteImageJSON(id, endpoint, token) |
| 427 | 427 |
if err != nil {
|
| 428 |
- // FIXME: Keep goging in case of error? |
|
| 428 |
+ // FIXME: Keep going in case of error? |
|
| 429 | 429 |
return err |
| 430 | 430 |
} |
| 431 | 431 |
img, err := NewImgJSON(imgJSON) |
| ... | ... |
@@ -565,7 +565,7 @@ func (srv *Server) poolAdd(kind, key string) error {
|
| 565 | 565 |
srv.pushingPool[key] = struct{}{}
|
| 566 | 566 |
break |
| 567 | 567 |
default: |
| 568 |
- return fmt.Errorf("Unkown pool type")
|
|
| 568 |
+ return fmt.Errorf("Unknown pool type")
|
|
| 569 | 569 |
} |
| 570 | 570 |
return nil |
| 571 | 571 |
} |
| ... | ... |
@@ -579,7 +579,7 @@ func (srv *Server) poolRemove(kind, key string) error {
|
| 579 | 579 |
delete(srv.pushingPool, key) |
| 580 | 580 |
break |
| 581 | 581 |
default: |
| 582 |
- return fmt.Errorf("Unkown pool type")
|
|
| 582 |
+ return fmt.Errorf("Unknown pool type")
|
|
| 583 | 583 |
} |
| 584 | 584 |
return nil |
| 585 | 585 |
} |
| ... | ... |
@@ -693,7 +693,7 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgID, |
| 693 | 693 |
out = utils.NewWriteFlusher(out) |
| 694 | 694 |
jsonRaw, err := ioutil.ReadFile(path.Join(srv.runtime.graph.Root, imgID, "json")) |
| 695 | 695 |
if err != nil {
|
| 696 |
- return "", fmt.Errorf("Error while retreiving the path for {%s}: %s", imgID, err)
|
|
| 696 |
+ return "", fmt.Errorf("Error while retrieving the path for {%s}: %s", imgID, err)
|
|
| 697 | 697 |
} |
| 698 | 698 |
out.Write(sf.FormatStatus("", "Pushing %s", imgID))
|
| 699 | 699 |
|
| ... | ... |
@@ -731,7 +731,7 @@ func (srv *Server) pushImage(r *registry.Registry, out io.Writer, remote, imgID, |
| 731 | 731 |
return imgData.Checksum, nil |
| 732 | 732 |
} |
| 733 | 733 |
|
| 734 |
-// FIXME: Allow to interupt current push when new push of same image is done. |
|
| 734 |
+// FIXME: Allow to interrupt current push when new push of same image is done. |
|
| 735 | 735 |
func (srv *Server) ImagePush(localName string, out io.Writer, sf *utils.StreamFormatter, authConfig *auth.AuthConfig) error {
|
| 736 | 736 |
if err := srv.poolAdd("push", localName); err != nil {
|
| 737 | 737 |
return err |
| ... | ... |
@@ -283,8 +283,8 @@ func TestPools(t *testing.T) {
|
| 283 | 283 |
t.Fatalf("Expected `pull test1 is already in progress`")
|
| 284 | 284 |
} |
| 285 | 285 |
err = srv.poolAdd("wait", "test3")
|
| 286 |
- if err == nil || err.Error() != "Unkown pool type" {
|
|
| 287 |
- t.Fatalf("Expected `Unkown pool type`")
|
|
| 286 |
+ if err == nil || err.Error() != "Unknown pool type" {
|
|
| 287 |
+ t.Fatalf("Expected `Unknown pool type`")
|
|
| 288 | 288 |
} |
| 289 | 289 |
|
| 290 | 290 |
err = srv.poolRemove("pull", "test2")
|
| ... | ... |
@@ -304,8 +304,8 @@ func TestPools(t *testing.T) {
|
| 304 | 304 |
t.Fatal(err) |
| 305 | 305 |
} |
| 306 | 306 |
err = srv.poolRemove("wait", "test3")
|
| 307 |
- if err == nil || err.Error() != "Unkown pool type" {
|
|
| 308 |
- t.Fatalf("Expected `Unkown pool type`")
|
|
| 307 |
+ if err == nil || err.Error() != "Unknown pool type" {
|
|
| 308 |
+ t.Fatalf("Expected `Unknown pool type`")
|
|
| 309 | 309 |
} |
| 310 | 310 |
} |
| 311 | 311 |
|
| ... | ... |
@@ -219,7 +219,7 @@ func assertIndexGet(t *testing.T, index *TruncIndex, input, expectedResult strin |
| 219 | 219 |
|
| 220 | 220 |
func assertKernelVersion(t *testing.T, a, b *KernelVersionInfo, result int) {
|
| 221 | 221 |
if r := CompareKernelVersion(a, b); r != result {
|
| 222 |
- t.Fatalf("Unepected kernel version comparaison result. Found %d, expected %d", r, result)
|
|
| 222 |
+ t.Fatalf("Unexpected kernel version comparison result. Found %d, expected %d", r, result)
|
|
| 223 | 223 |
} |
| 224 | 224 |
} |
| 225 | 225 |
|