Commit Graph

46493 Commits

Author SHA1 Message Date
Cong 03e5fae715 Correct command to copy binary (#3367)
* Correct command to copy binary

Correct path to copy binary-daemon.
Remove command to copy binary-client (it's not available).

* Use the make install target

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-06-23 18:14:51 -07:00
Jim Galasyn bfda12f536 Fix allowed intervals for UCP metrics (#3693)
Removed "d" as an option for the METRICS_DISK_USAGE_INTERVAL and METRICS_DISK_USAGE_INTERVAL environment variables.
2017-06-23 12:34:41 -07:00
Victoria Bialas a3bbadb7ed Add d4mac client side FAQ (#3671)
* add d4mac client side FAQ

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added link to FAQs from Getting Started

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added FAQs re: installing client certificates

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added more detail on client and server side certs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed Mac and Windows specific topics

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed formatting so that content renders properly

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* incorporated review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* updated Windows FAQ to clarify directories copy, remove refs to db

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* change ref from Mac to Windows on Win side

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added certificate topic to Win getting started

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* review comments, remove 'entities' clarify meaning

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-23 11:48:03 -07:00
Tim Sorbera 59f1eceb8e update app.py to have consistent spacing (#3659)
shouldn't have both tabs and spaces in the same file
2017-06-22 16:36:27 -07:00
Nope Nope 483a8a8370 Correct example script (#3590)
Previous version could not work as grep -q does not print anything to stdout, only exits with a status code depending on a match was found or not. Hence the variables were always empty and could not be compared with 0
2017-06-22 16:18:13 -07:00
Pieter Scheffers 8f27eeac35 htpasswd passwords should use bcrypt hashing (#3401) 2017-06-22 15:59:24 -07:00
Romain Rouvoy 8cc7d23ba4 doc: Docker driver for Grid 5000 infrastructure (#3360)
Adding a reference to a new DockerMachine driver made available for the Grid5000 computing infrastructure.
2017-06-22 15:41:41 -07:00
Jim Galasyn 514d858774 Add use case for China registry mirror (#3682) 2017-06-22 13:08:43 -07:00
Misty Stanley-Jones 7a0b00a188 Add simple pull examples with auth (#3574) 2017-06-22 11:47:05 -07:00
Victoria Bialas 5084ca668b added release notes for 1706-ce-rc5 (#3679)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-21 16:53:24 -07:00
Jérôme Petazzoni e04cbdbd7c Remove extraneous **warning** (#3546)
* Remove extraneous **warning**

The .warning class already prepends "Warning"

* changed Warning tag to vanilla

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-21 15:40:34 -07:00
Taio Jia d0092e4660 Add notes (#3510)
* Add notes

After Docker Cloud Agent installed successfully, and run the `docker swarm init` and `docker swarm join` commands will got the errors, and can not register swarm with Docker Cloud.

```
*******************************************************************************
Docker Cloud Agent installed successfully
*******************************************************************************

You can now deploy containers to this node using Docker Cloud

ubuntu@test:~$ docker swarm init
docker: 'swarm' is not a docker command.
See 'docker --help'.

ubuntu@test:~$ sudo docker run -ti --rm -v /var/run/docker.sock:/var/run/docker.sock dockercloud/registration
Unable to find image 'dockercloud/registration:latest' locally
latest: Pulling from dockercloud/registration
79650cf9cc01: Pull complete 
e720390eb80b: Pull complete 
7b619be6318c: Pull complete 
Digest: sha256:b0c89c6a446700394c7b85d93b9b1117e517504c64577586f535ceec353628e7
Status: Downloaded newer image for dockercloud/registration:latest
Error response from daemon: 404 page not found
```
So, `Use the Docker Cloud Agent to Bring your Own Host` does not support swarm mode.

* formatted note, clarified Cloud standard and swarm modes

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedits, rewrites

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-21 12:59:05 -07:00
Victoria Bialas 206977b90c clarify links to cloud topics (#3669)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-20 16:13:28 -07:00
ArthurMa b0a04d1d9f centos Uninstall lost a dependency (#3651)
when I degrade to lower docker version, I found that docker-engine-selinux dependency need to remove.
2017-06-20 14:14:34 -07:00
Andy Clemenko 65e69afdfe Added anchor for API (#3513)
The anchor is going to be used in the chaining doc.
2017-06-20 14:11:44 -07:00
Ryan Zhang 850cea684a Replace UCP controller with manager (#3326) 2017-06-20 13:56:55 -07:00
Jon-Michael Deldin 8cd94d3873 Fix test DB creation in Compose's database.yml (#3123)
Without the host and credentials, the `myapp_test` database is not
created, and instead, the user receives a PG error and a long backtrace.
This commit moves the credentials to a default anchor to share across
development and test environments.
2017-06-20 13:55:06 -07:00
Wang Jie 099178a832 Update reference.md (#3650)
Delete the period (.) in a table cell to keep style consistency.
2017-06-20 13:49:59 -07:00
mtilson f0a851beb1 Update completion.md (#3652) 2017-06-20 13:49:22 -07:00
John Paul Herold 218fcfed6a Fix broken link to distributed app bundles (#3660) (#3661)
The "Docker for AWS / Deploy your app" page has a broken link to
distributed application bundles. There now is a dedicated page within
the documentation repo ("Docker Compose / Docker stacks and distributed
application bundles") that we can reference.

Tracking: #3660
https://github.com/docker/docker.github.io/issues/3660

Signed-off-by: John Paul Herold <johnpaul7@gmail.com>
2017-06-20 13:45:56 -07:00
maynep c0639bba84 Removed incorrect encrypt comment text (#3663)
Removed ", encrypt it," from comment in non-encrypted code block
2017-06-20 11:59:38 -07:00
Wang Jie e3ddcf6c05 Update stack-yaml-reference.md (#3653) 2017-06-20 11:55:53 -07:00
Misty Stanley-Jones b63c1aee78 Fix broken link (#3658) 2017-06-20 11:53:15 -07:00
Sergey Sarbash a145f69b6c Create index.md (#3611) 2017-06-20 11:46:01 -07:00
Wang Jie b524012975 Create join.md (#3604) 2017-06-20 11:45:23 -07:00
Wang Jie 3c203c28c0 Create create.md (#3603) 2017-06-20 11:44:54 -07:00
Wang Jie cc141086b4 Create configure-tls.md (#3602) 2017-06-20 11:44:16 -07:00
Wang Jie 4c36e64d38 Create strategy.md (#3600) 2017-06-20 11:43:38 -07:00
Wang Jie 931508d884 Create rescheduling.md (#3599)
Delete extra spaces.
2017-06-20 11:43:16 -07:00
Wang Jie ded60e464b Create provision-with-machine.md (#3597) 2017-06-20 11:42:58 -07:00
Wang Jie e763192fe1 Create discovery.md (#3596) 2017-06-20 11:42:16 -07:00
Wang Jie 4801b38ba9 Create troubleshoot.md (#3585) 2017-06-20 11:21:12 -07:00
Wilfred Hughes a015f3dae4 Fix typo (#3664) 2017-06-20 11:20:34 -07:00
Sequoia McDowell 744e5eeec8 Fixing documentation for v2 `links` (#3641)
wrapping array values in quotes is required.
2017-06-20 11:12:57 -07:00
Wang Jie 9ad6e05f42 Update find-an-issue.md (#3637) 2017-06-20 11:12:23 -07:00
Wang Jie ea78ac7f05 Update slack-integration.md (#3635) 2017-06-20 11:12:01 -07:00
Wang Jie 570517d171 Update installing-cli.md (#3634)
* Update installing-cli.md

* Update installing-cli.md
2017-06-20 11:11:33 -07:00
Wang Jie c2edff442f Update issues.md (#3633) 2017-06-20 11:11:02 -07:00
Wang Jie 109fe83c3e Update service-links.md (#3632) 2017-06-20 11:10:28 -07:00
Wang Jie c35be0bd3c Fix formatting (#3631) 2017-06-20 11:09:56 -07:00
Wang Jie ff7be22e02 Grammar error in Kitematic topic (#3630) 2017-06-20 11:09:22 -07:00
Wang Jie 12d8a7ada7 Update release-notes.md (#3629) 2017-06-20 11:08:29 -07:00
Misty Stanley-Jones baaead7cdd Update logging driver options from code 2017-06-20 11:07:50 -07:00
Misty Stanley-Jones 9d53ce7350 Clarify routing mesh port 2017-06-20 11:07:50 -07:00
Misty Stanley-Jones 11fcbcb88a Clarify size and virtual size 2017-06-20 11:07:50 -07:00
Ondrej Zavadil 6ce614ea12 Changing typo in 'docker machine ls' command (#3614)
The command is 'docker-machine ls'. Current version has a typo and is missing the dash '-'
2017-06-20 11:07:18 -07:00
Wang Jie f69d20468d Update status-code-comparison-to-docker.md (#3607) 2017-06-20 11:05:49 -07:00
Wassim Dhif feca701bda Reword sentence 2017-06-20 11:01:52 -07:00
Michael ed9687d4f6 Create troubleshoot.md (#3561)
removed double parentheses from link
2017-06-20 10:58:33 -07:00
Andy Clemenko 5bda6b0b33 Correcting the docs. (#3514) 2017-06-20 10:57:44 -07:00