1
0
mirror of https://github.com/docker/docs.git synced 2026-11-03 11:12:47 +03:00
Commit Graph

46336 Commits

Author SHA1 Message Date
Marko Klemetti
1efadb8a88 Add sh/alpine -compliant wait-for to options. (#3157) 2017-05-04 21:28:58 +00:00
Wang Jie
e75306d864 Update set-up-vulnerability-scans.md (#3160) 2017-05-04 21:27:51 +00:00
Wang Jie
9421e6e757 Update tls.md (#3162) 2017-05-04 21:25:06 +00:00
Victoria Bialas
9a4986465a Linked docker build in a Caution note (#3165)
Added an additional link to the `docker build` command topics per user feedback
2017-05-04 10:42:17 -07:00
Victoria Bialas
f8d01e0f3a added links to info about stable and edge channels (#3155)
* added links to info about stable and edge channels

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

* added link for edge to both, moved tip above screen snap

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-03 16:42:22 -07:00
Victoria Bialas
81a46448af fixed notes on d4mac, d4win per new format (#3152)
* fixed notes on d4mac, d4win per new format

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

* streamlined d4win pre-install notes, surfaced toolbox option

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-03 13:03:59 -07:00
Victoria Bialas
ab47785dc7 Machine unset env var, Cloud updates (#3146)
* added unset env instructions

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

* machine env details, cloud swarm updates, copyedits

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

* fix per review, add Azure to note

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-03 12:01:33 -07:00
Wang Jie
a5d6ded2f9 Update index.md (#3144)
Should "a" be replaced with "an" here?
2017-05-03 17:53:30 +00:00
John Mulhausen
5efb15266c Update index.md 2017-05-02 17:44:33 -07:00
Victoria Bialas
dc99dc11f5 fix-up inline command examples (#3139)
Removed prompt as it's confusing in a one-line statement where you are telling them to run a command.
2017-05-02 15:04:21 -07:00
John Mulhausen
476119cd9d Fixing typo 2017-05-02 14:50:48 -07:00
Victoria Bialas
e552c02d7b WIP: add Cloud link to Azure topics (#2713)
* add Cloud link to Azure topics

WIP: 1st draft includes, tabs re: SSH key topics

adding more Azure Cloud content and SSH includes

copyedits

cloud azure, aws topics organization, videos

incorporated review comments

copyedits, colour-coded TBD's

copyedits to make create a swarm w/AWS and Azure consistent

updated links to use new titles

added SSH key setup to the Swarm overview list of links

updated link services titles

add ssh to glossary, note autoredeploy limitations

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

* screen snaps, updates per latest on staging

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

* added link

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

* resolved conflicts in TOC

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

* added Azure accept EULA/enable subscription, more steps, snaps

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

* fixed the comments to not break numbering

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

* new snaps and review comments incorporated from Alberto and Ryan

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

* added screen snaps, review comments, more steps

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

* added screen snaps, detail to Azure create swarm

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

* new snap showing linked AWS as provider

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

* AWS screen snaps and detailed steps

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

* AWS swarm name rules clarification

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

* added x-refs to edition topics on config per reviews

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

* added connect screen snap w/production commands, AWS pricing

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

* added more code examples and clarification to swarm connect

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

* added more code examples for Azure and AWS

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-02 13:28:55 -07:00
Victoria Bialas
fe478717e5 Merge pull request #3136 from londoncalling/redis-in-example-explain
add detail on redis default port
2017-05-01 16:39:07 -07:00
Wang Jie
2fff7db39d Update index.md (#3111)
* Update index.md

* Update index.md
2017-05-01 23:15:46 +00:00
John Mulhausen
48aac4d47a Hackathon results 2017-05-01 16:12:49 -07:00
Victoria Bialas
71b91bd468 add detail on redis default port
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-01 15:56:50 -07:00
Victoria Bialas
237157a055 Merge pull request #3135 from londoncalling/docker-cloud-vulnerabilities
added detail on vulnerability severity for security scanning
2017-05-01 13:42:20 -07:00
Victoria Bialas
d9906e3aa6 added detail on vulnerability severity for security scanning
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-01 13:08:31 -07:00
Victoria Bialas
1b190d8f62 Merge pull request #3133 from londoncalling/cloud-aws-linking-steps-reorg
user feedback reorg AWS role creation steps per new UI
2017-05-01 12:43:36 -07:00
Josh south
822d52a4c7 Fix overflow issue (#3132)
- fix menu overflow
- add docker con baner
2017-05-01 19:28:55 +00:00
Victoria Bialas
0502c71441 user feedback reorg AWS role creation steps per new UI
copyedit to remove duplicate heading

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-01 12:22:11 -07:00
Martin Folkers
39f62ed0a1 Update part2.md (#3129) 2017-04-30 12:27:30 +00:00
John Mulhausen
fb76a4bdf7 Fixes #3106 2017-04-28 17:43:17 -07:00
John Mulhausen
6495c1df73 Fixes #3023, Fixes #3015 2017-04-28 17:36:47 -07:00
hkawamitsu
8a4cb28030 Add NTT Communications Enterprise Cloud machine driver to the list of 3rd-party docker machine drivers (#3010)
* Add 3rd party machine driver, NTT Communications Enterprise Cloud

* fix the order of NTT Communications Enterprise Cloud driver
2017-04-29 00:31:06 +00:00
Derek Olsen
054fced71d Typo in overview.md (#3121) 2017-04-29 00:05:21 +00:00
Wang Jie
c6a405531d Update install.md (#3095)
Add an escape character.
2017-04-28 22:08:31 +00:00
Andy Neff
3de6ebc21e Update docker-compose index.md (#3090)
There were a number of things wrong with the `restart` definition

1. The volumes note came after the restart section rather than before
2. The restart command used array notation rather than map. This is confusing to those unfamiliar with yaml and inconsistent with the rest of the documentation
3. Using `docker-compose` myself, saying `restart: no` does not work, but `restart: "no"` does. 

```
ERROR: The Compose file './docker-compose.override.yml' is invalid because:
services.letsencrypt.restart contains an invalid type, it should be a string
```
2017-04-28 22:07:50 +00:00
hacfi
3e137458e8 Fix yml indention (#3089) 2017-04-28 22:06:04 +00:00
Sam Cook
65c3f1befa Remove copy error syslog TCP+TLS options example (#3097)
The syslog TCP+TLS example suggests that the relevant options are `syslog-tls-ca-cert=syslog-tls-ca-cert=...`, `syslog-tls-cert=syslog-tls-ca-cert=...` and `syslog-tls-key=syslog-tls-ca-cert=...`. This corrects this example.
2017-04-28 22:03:39 +00:00
Michal Guerquin
ca60c06cc2 Update index.md (#3102) 2017-04-28 22:02:19 +00:00
John Yani
b07f615784 Wrong order of docker compose restart section (#3093) 2017-04-28 14:46:11 -07:00
Wang Jie
a7a6302c00 Update reconfigure.md (#3108)
Remove the singular form of the verb to keep consistency.
2017-04-28 20:47:54 +00:00
Wang Jie
59c13fd220 Update restore.md (#3109) 2017-04-28 20:47:25 +00:00
Wang Jie
2df7c199ef Update garbage-collection.md (#3110) 2017-04-28 20:44:41 +00:00
Vladimir Jimenez
03c6a6c335 Fix disappearing navbar with affix (#3099) 2017-04-28 20:43:34 +00:00
Sarah Park
24f672183d Update how users download the db file for scanning (#3120)
* Update how users download the db file for scanning

* Add screenshots for the "download CVE file" instructions
2017-04-28 13:15:11 -07:00
Victoria Bialas
2e49c74ce7 Updated links to more info on stack files (#3104)
* Updated links to more info on stack files

### what's changed

Updated x-refs to more info on `docker stack deploy` and stack files (to disambiguate from Docker Cloud stack files)

### Reviewers

@alberto @caylorme @stevvooe

* fixed link to deploy key

* added x-refs and fixed more links

* copyedits
2017-04-28 12:47:30 -07:00
Ondrej Sika
71f06d8f96 engine/admin/index - Fix typo in Debian log path (#3113) 2017-04-28 19:32:48 +00:00
Shlomi Izikovich
5b993445b0 Update part3.md (#3114) 2017-04-28 19:31:30 +00:00
Alex Rudall
bda9992219 Fix typo in persistent-data-volumes.md (#3115) 2017-04-28 19:31:07 +00:00
Joao Fernandes
2419c724e1 Clean get Docker (#2581)
* Clean get Docker

* Fix deleted changes

* Align content to the left
2017-04-28 11:25:32 -07:00
Joao Fernandes
bebc8fb53e Rename entry in TOC (#3119) 2017-04-28 10:59:53 -07:00
Jim Galasyn
35f2f181b3 Update LDAP integration topic for UCP 2.1.3 web ui (#3107) 2017-04-27 15:37:29 -07:00
Victoria Bialas
8cb2926ce6 copyedits, link fixes on glossary in test.md (#3088)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-26 14:45:41 -07:00
John Mulhausen
9c95f929f5 Update part4.md 2017-04-26 14:16:00 -07:00
John Mulhausen
c7737977f2 Update index.md 2017-04-26 13:55:25 -07:00
Xianlu Bird
903df7ebfc Fix published&target description in ports section (#3016) 2017-04-26 20:52:14 +00:00
Daniel Maslowski
50e9e49552 Note on mixing network_mode with links in Docker compose file (#3049) 2017-04-26 20:50:47 +00:00
Sudhagar Chinnaswamy
e8ec2c3c68 Fixed broken link (#3059)
Fixed broken link ("Run multiple services in a container")
2017-04-26 20:48:56 +00:00