Commit Graph

46360 Commits

Author SHA1 Message Date
Misty Stanley-Jones
684d81397b Don't run bundle update in the Dockerfile (#3770)
This avoids the US-ASCII bug in jekyll-redirect plugin
v17.03-release
2017-07-03 15:17:07 -07:00
John Mulhausen
404a7ba8c4 Fix for relative file path 2017-06-30 16:09:25 -07:00
Misty Stanley-Jones
4a86875174 Enable archive code for 17.03 (#3746) 2017-06-30 09:42:38 -07:00
Misty Stanley-Jones
3bb19da806 Add static content for archiving (#3751) 2017-06-29 16:55:38 -07:00
Misty Stanley-Jones
eb0ff71b5d Point to newer registry topic (#3719) 2017-06-27 16:33:43 -07:00
Bingshen Wang
7a0c285574 Update json-file.md (#3716)
Fix typo in the `json-file` driver document.
2017-06-27 13:36:04 -07:00
Michael Genereux
38ffd854ec Subsequent open(2) causes copy-up operation (#3709)
* Second open(2) causes copy-up operation

The documentation incorrectly credits the first, read-only call to open as the trigger of the copy-up operation.  It's the subsequent read-write call that actually triggers the copy-up operation.
2017-06-27 13:27:53 -07:00
Misty Stanley-Jones
387c4f5025 remove extra -o flag (#3712) 2017-06-26 16:19:53 -07:00
Misty Stanley-Jones
023278aff2 Add link to Docker Machine setup for Linux hosts (#3711) 2017-06-26 15:44:04 -07:00
Florian Kempenich
c9cf94df43 Fix typo in docker-machine setup for zsh (#3701)
The file that was downloaded was actually the autocompletion for `docker` and not `docker-machine`
I tested the "fix" on my local installation: It's working ;)
2017-06-26 15:32:39 -07:00
Wilfred Hughes
7391a82648 Minor grammar fix (#3703) 2017-06-26 13:32:02 -07:00
Chessmasterrr
914f3b4ac6 Changed grep flags (#3706)
If the first grep is already quiet, the second one will not find anything and exit with error code 1. So the quiet flag has to be on the second grep command to get the script working.
2017-06-26 13:31:51 -07:00
Thomas Grainger
464b983761 Add amazonec2 commands that were missing documentation (#3589) 2017-06-26 13:29:49 -07:00
Misty Stanley-Jones
c1dbb5b012 Add information about userns-remap (#3678)
* Add information about userns-remap

* Split into its own topic, do some TOC magic
2017-06-26 10:14:07 -07:00
Justin Menga
b1d32c948c Update awslogs.md (#3319)
* Add docs for awslogs-multiline-pattern and awslogs-datetime-format

Signed-off-by: Justin Menga <justin.menga@gmail.com>
2017-06-26 09:27:02 -07:00
Brian Goff
8ab3a05d03 Update install to ensure extras repo is enabled (#3702)
* Update install to ensure extras repo is enabled

The `extras` repos are required for 17.06 which depends on the
`container-selinux` package.

CentOS typically has the repo enabled by default, but in some cases may
be disabled, and RHEL never has it enabled by default.

This is provided by the main Fedora repos and does not require any extra
setting.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

* Jekyll is picky about indentation.

* Jekyll is picky about indentation.
2017-06-26 09:25:37 -07:00
Misty Stanley-Jones
b1aa298c16 Docs for Compose 1.14 (#3697)
* Specify Compose version for Compose file formats (#3297)

* Specify Compose version for Compose file formats

Explicitly specifying Compose versions file formats 2.1 and 2.2.

* corrected typo 2.1 --> 2.2

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

* Document new Compose 1.14.0 features (#3695)

Signed-off-by: Joffrey F <joffrey@docker.com>

* Current compose is 1.14.0 (#3690)

Signed-off-by: Guillaume Rose <guillaume.rose@docker.com>

* Fix typo
2017-06-23 18:15:01 -07:00
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