Commit Graph

53325 Commits

Author SHA1 Message Date
Traci Morrison 55a5cca514
Merge pull request #9301 from traci-morrison/azure-subnet-size
Add warning about the impact of not following the config guidelines
2019-10-01 14:15:16 -04:00
Usha Mandya 286bbab405
Merge pull request #9544 from usha-mandya/mac-sys-reqs
update mac system requirements
2019-10-01 16:38:46 +01:00
Adrian Plata 40c1cf805b
Merge pull request #9541 from adrian-plata/fips-fix
Clarify FIPS instructions
2019-10-01 07:55:03 -07:00
Olly P 2bdcf557d9
Merge branch 'master' into azure-subnet-size 2019-10-01 15:16:24 +01:00
Alastair Smith bd48da763b re-organize + fix global header 2019-10-01 08:51:34 -05:00
Usha Mandya 3ae07dbd2b update mac system requirements 2019-10-01 14:06:41 +01:00
Usha Mandya 8499c56b48
Merge pull request #9543 from stevenfollis/patch-1
Enhanced Export Artifacts script
2019-10-01 13:59:45 +01:00
Steven Follis 7eea662f4f
Enhanced Export Artifacts script
- Fixed an errant line break
- Switched to more verbose `docker container X` syntax rather than shorthand aliases
- Swapped shorthand flags to `--` variants for clarity
2019-10-01 08:19:12 -04:00
Adrian Plata f56653138a Clarify FIPS instructions
Signed-off-by: Adrian Plata <adrian.plata@docker.com>
2019-09-30 16:43:43 -07:00
Usha Mandya 73162cff51
Merge pull request #9537 from usha-mandya/template-patch
fix numbering and section title
2019-09-30 16:53:10 +01:00
Usha Mandya f4157cf697 fix numbering and section title 2019-09-30 15:00:29 +01:00
Adrian Plata 29a6914fe4
Merge pull request #9527 from adrian-plata/experimental-emphasis
Emphasizing no production environments for experimental features
2019-09-27 11:14:00 -07:00
Adrian Plata fc4d3872c4 Emphasizing no production environments for experimental features
Signed-off-by: Adrian Plata <adrian.plata@docker.com>
2019-09-27 10:50:22 -07:00
Usha Mandya 7720674fc2
Merge pull request #9516 from usha-mandya/mac-disk-patch
update mac disk utilization
2019-09-27 17:54:29 +01:00
Usha Mandya 0eb2c68015
Merge pull request #9479 from ollypom/template-formatting
Docker Templates Added Platform to Library Metadata
2019-09-27 17:51:11 +01:00
Usha Mandya b8594dd299 fix review comments from Dave 2019-09-27 14:50:47 +01:00
Usha Mandya a2e95725d3
Merge pull request #9521 from avezinaATastus/patch-1
Fix Typo end-to-end-install.md
2019-09-27 10:36:29 +01:00
Usha Mandya 80fde0bb38
Merge pull request #9458 from robbertkl/patch-1
Fix FROM command
2019-09-27 10:34:45 +01:00
Dawn W 4d93f1c1ef
Merge pull request #1340 from docker/master
merging master to the patch release branch
2019-09-26 17:21:38 -07:00
Traci Morrison 0170e73772
Merge pull request #1338 from traci-morrison/add-ucp-config-point
Add the new UCP configuration point
2019-09-26 16:15:35 -04:00
Traci Morrison 3a79d50052 Additional edits 2019-09-26 15:46:03 -04:00
avezinaATastus 547092277b
Fix Typo end-to-end-install.md 2019-09-26 15:22:50 -04:00
ada mancini e1034b60ed update iptables=false documentation (#9482)
make it clearer that this is not intended for end-users
2019-09-26 16:42:12 +01:00
Psy-Q 25218530a6 Stop referring to deprecated 'links' feature, replace with 'depends_on' where appropriate (#9480) 2019-09-26 16:37:02 +01:00
Traci Morrison 97f536288e Add the new UCP configuration point 2019-09-26 09:47:44 -04:00
Dawn W 7d28ee8670
Merge pull request #1337 from docker/master
bringing patch release branch up-to-date
2019-09-25 16:22:24 -07:00
Jose J. Escobar 996f2e7d43 Update index.md (#9498)
* Update index.md

Fixed broken link.

* Removed full URL
2019-09-25 15:18:23 -07:00
Nikita Potapenko ecaf5b7eec Fix typo (#9511) 2019-09-25 15:16:23 -07:00
Traci Morrison 0fc249f28d
Merge pull request #9517 from traci-morrison/engdocs-39
Add commands to export scripts
2019-09-25 15:43:00 -04:00
Traci Morrison 18c9ec932b Add commands to export scripts 2019-09-25 10:59:08 -04:00
Usha Mandya 6acf92989b update mac disk utilization 2019-09-25 14:04:57 +01:00
Dawn W ad4cf7ec1e
Merge pull request #1334 from docker/master
pull private master into sept patch release branch
2019-09-24 13:58:09 -07:00
Traci Morrison 9a28b67c84
Merge pull request #8662 from trapier/default-addr-pool
Correct swarm init default-address-pool to default-addr-pool
2019-09-24 16:47:52 -04:00
Traci Morrison b0ad928444
Merge pull request #9406 from millerdz/patch-11
Remove web interface upgrade section
2019-09-24 11:43:02 -04:00
Trapier Marshall 6c5174393e Correct default-address-pool to default-addr-pool
WHAT I DID:

```
git grep -l default-address-pool  |\
xargs sed -i 's:default-address-pool:default-addr-pool:g'
```

... then put the `engine/release-notes.md` back to
`--default-address-pool`, since it refers to `dockerd`.

REFERENCES:

client version 18.09.3:

```
$ docker swarm init --help |grep default-addr
      --default-addr-pool ipNetSlice           default address pool in CIDR format (default [])
      --default-addr-pool-mask-length uint32   default address pool subnet mask length (default 24)
```

server version 18.09.3:

```
$ dockerd --help |grep default-addr
      --default-address-pool pool-options       Default address pools for node specific local networks
```
2019-09-24 11:00:00 -04:00
Dawn W 119cd05a63
Merge pull request #9505 from david-yu/patch-17
Missing quote for swarm port from restore docs
2019-09-23 11:37:22 -07:00
David Yu 96b73b21ed
Missing quote
Missing quote from restore docs
2019-09-23 11:23:57 -07:00
Dawn W 24eb4a1e89
Merge pull request #1332 from docker/master
pulling master into the sept branch release
2019-09-23 11:17:51 -07:00
Kavika Tavui 5ab9035a83 The documentation is miseleading (#9317)
pasting the expected output in the CL code box suggests it is part of the command to be copy-pasted, this should be indicated as the expected output
2019-09-23 18:10:47 +01:00
Trapier Marshall 5a466a57c3 ucp: fix whitespace on node labels doc (#9395)
what i did:
- fix whitespace so markdown numbering is consistent

how i tested:
1. build docs locally `docker-compose build; docker-compose up -d`
2. verify numbering corrected
3. deploy compose file through UCP 3.2.1 UI to make sure its spacing was
   unaffected\*

\* note: not addressing outdated screenshots with this commit

Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2019-09-23 18:02:37 +01:00
Olly P d31ec2985c
Merge branch 'master' into patch-11 2019-09-23 17:54:13 +01:00
Derrick Miller dbee5b0ab6 Fix typos (#9494) 2019-09-23 17:51:24 +01:00
Jose J. Escobar 64c8e6c6ed Update back-up-swarm.md (#9496)
- Typo on symbol
- Added word "manager" to clarify the type of nodes where the procedure will be repeated.
2019-09-23 17:50:50 +01:00
Usha Mandya af803ce80d
Merge pull request #8481 from thaJeztah/stack_sysctl
[19.03] Update compose-file reference for sysctls
2019-09-23 16:43:52 +02:00
Usha Mandya 1b914b58be
Merge pull request #9451 from Potapy4/patch-1
Update devicemapper path
2019-09-23 16:35:09 +02:00
Sebastiaan van Stijn cf8215ec58
Update compose-file reference for sysctls
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-23 16:28:40 +02:00
Traci Morrison 132f2bed14
Merge pull request #9465 from traci-morrison/engdocs-162
Fix broken links
2019-09-23 10:27:16 -04:00
Usha Mandya a556c61cf7
Merge pull request #9351 from thaJeztah/remove_library_samples
Remove library samples, and link to Docker Hub instead
2019-09-23 16:21:57 +02:00
lena-larionova c26fd49707 Removed inaccurate info on permissions (#9495)
Signed-off-by: Lena Larionova <lena.larionova@docker.com>
2019-09-20 10:25:49 -07:00
Jose J. Escobar 9351f15192 Update index.md (#9478)
Changed the order for the actions to be in chronological order. Currently, it seems you have to find the replica ID before running the command. This is emphasized by the "Then run". This is not the case. You use the replica ID after you run the command.
2019-09-20 09:55:10 -07:00