Commit Graph

71 Commits

Author SHA1 Message Date
Jeffrey Morgan d15739c5e7 Merge branch 'master' into consolidation-changes 2018-11-14 18:29:09 -05:00
Jeffrey Morgan ca466a55ed Rename Docker Store and Docker Cloud - WIP 2018-10-04 19:41:32 -04:00
Oscar Caballero 269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02:00
Trapier Marshall a1de8bf85f typo in ucp ldap config (#6821) 2018-06-06 11:12:45 -07:00
Eiichi Kitagawa 64d1bf5020 Adding "windows" label to Windows node. (#6368)
* Adding "windows" label to Windows node.

Additional steps to add label to Windows Nodes.  This will allow admin to filter Windows node when creating a service like this.
`docker service create --constraint engine.labels.os==windows --name winonly microsoft/nanoserver`  The same steps are on this article: https://success.docker.com/article/how-can-i-assign-a-service-to-windows-nodes-only

* wrong environment variable fixed.
2018-05-14 11:13:01 -07:00
Eiichi Kitagawa 09f8c126f4 missing \ on multi-line command (#6442) 2018-04-12 10:15:40 -07:00
Joao Fernandes 5a88bacf47
[2.2] Always use your client bundle (#6422) 2018-04-10 15:11:22 -07:00
Joao Fernandes 683d14ae4c [2.2]Fix snippet to prepare Windows node 2018-04-05 11:46:52 -07:00
Joao Fernandes d3e24a2807
Update UCP config file reference (#6222)
Update UCP config file reference
2018-03-20 15:39:35 -07:00
Michael 5edf2f07d9 Update "configure local computer" for SUSE SLES 12 2018-03-15 11:52:39 -07:00
Akim Demaille 14b53b68c3 Jekyll: don't put {% raw %} directives in pre blocks
Replace all occurrences of

    ```foo
    {% raw %}
    bar
    {% endraw %}
    ```

(which generates spurious empty lines in the rendered pre block) with

    {% raw %}
    ```foo
    bar
    ```
    {% endraw %}

Also, fix some occurrences where the raw section is too large and
prevented interpretation of Jekyll directives.

This is the syntax used in the documentation of Jekyll itself:

https://raw.githubusercontent.com/jekyll/jekyll/master/docs/_docs/templates.md

FTR, done with two perl substitutions:

    '^([\t ]*```[^\n]*
    )([ \t]*\{% raw %\}[^\n]*
    )' '$2$1'

and

    '^([ \t]*\{% endraw %\}[^\n]*
    )([\t ]*```[^\n]*
    )' '$2$1'

and manually tweaks.  A mechanical check would be most useful.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-03-13 10:28:29 -07:00
Trapier Marshall 6211d325e8 indicate units on ucp metrics intervals
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2018-03-12 14:17:54 -07:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
Aaron Thomas 47f9a8cf70 Added AWS IdleTimeout recommendations
@vikstrous: this change deals with some long-running DTR operations that required a 600 second idle timeout and missing for AWS LBs. The added change was sourced from: http://docs.aws.amazon.com/cli/latest/reference/elb/modify-load-balancer-attributes.html. Thanks!
2018-01-02 10:06:33 -08:00
Jim Galasyn 3454f7753e
Fixup PowerShell code blocks (#5306) 2017-11-14 09:16:36 -08:00
Alex Seymour 738d87c1bf Correct sync_schedule in ucp-description-file.md (#5274)
* Correct sync_schedule in ucp-description-file.md

The sync_schedule parameter in the auth.ldap section of the UCP Configuration file contains a seconds field, whilst the existing documentation claims this is omitted. Should explicitly call out inclusion of seconds field here, as this is usually omitted in a standard CRON entry.

* Update UCP config

Make explicit that the `sync_schedule` needs to include the seconds field, but it always needs to be zero.
2017-11-10 13:12:18 -08:00
Vivek Saraswat ae8068f22f Run only signed images change (#5172)
* Run only signed images change

It turns out the "run only signed images" feature only works by selecting teams in the `docker-datacenter` org.  This became an issue in UCP 2.2 which has multiple org support.
2017-10-31 09:53:24 -07:00
Jim Galasyn f802229908
Add note about signing policy (#5171) 2017-10-30 16:01:20 -07:00
Michael Irwin 5e92b2ef43 Typos fixes in "Use Trusted Images for CI" (#5163)
Fixed a few typos. No real content changes.

Signed-off-by: Michael Irwin mikesir87@gmail.com
2017-10-30 09:51:19 -07:00
Jim Galasyn ae01237488
Add lb examples to UCP (#5160) 2017-10-27 16:26:59 -07:00
Jim Galasyn d73e595a7e
Add uninstall UCP steps for Windows Server (#5154) 2017-10-27 15:55:20 -07:00
Jim Galasyn c497dbf42e Remove old note about custom tls certs and compose (#4954) 2017-10-13 15:01:11 -07:00
Wang Jie c685515a35 Update use-node-local-network-in-swarm.md (#4768) 2017-10-02 10:47:33 -07:00
Wang Jie 7eb41aa0c0 Update ucp-configuration-file.md (#4767) 2017-10-02 10:46:29 -07:00
Wang Jie 220f8e7676 Update store-logs-in-an-external-system.md (#4766) 2017-10-02 10:44:15 -07:00
Wang Jie d983f72fdc Update set-up-high-availability.md (#4765) 2017-10-02 10:43:45 -07:00
Wang Jie 7c7cbd9395 Update integrate-with-dtr.md (#4763) 2017-10-02 10:43:18 -07:00
Wang Jie 49ef1e5828 Update set-session-timeout.md (#4764) 2017-10-02 10:42:45 -07:00
Wang Jie 7f40428fa0 Update join-windows-worker-nodes.md (#4762) 2017-10-02 10:42:15 -07:00
Jim Carroll 9de1f5ed49 Updated broken path (#4715)
Updated path to reflect current location of manage-access-with-collections.md
2017-09-28 17:16:28 -07:00
Andy Clemenko c976c02331 remove the recommendation of 7 nodes. (#4657)
removing the recommendation of 7 managers nodes based guidance from engineering. they claimed 7 manager nodes was less performative then 5.
2017-09-18 17:00:11 -07:00
Jim Galasyn b576e23bf5 Update ElasticSearch command (#4659) 2017-09-18 14:45:21 -07:00
Trapier Marshall 102684b047 UCP: operationalize config file editing (#4605)
Made instructions for editing UCP config copy-pastable with in-line
comments. This removes the need to copy-part-of-a-line,
paste-some-output-from-another-command, copy-next-part-of-a-line,
repeat, until a command is complete.

Also moved the "Example config" below "Inspect and modify" to improve
readability as "Inspect and modify" is a more common workflow.

Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-09-15 15:44:03 -07:00
Trapier Marshall f42f2a9858 ucp: correct agent config change command (#4595)
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-09-13 15:55:21 -07:00
Trapier Marshall b6137ace7c indicate how to modify ucp config file (#4508)
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-09-11 17:01:17 -07:00
Trapier Marshall 5fe6bc542a syntax: docker config create for ucp (#4494)
`--name` is not a valid argument on `docker config create`

Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-09-11 16:37:20 -07:00
Victoria Bialas 7e9234338b Fix broken links on UCP links and TOC on 2.1 (#4573)
* fix UCP links and TOC on 2.1

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

* re-organized 2.1 TOC to put TLS certs at end like for 2.2

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

* fix links per Joao's comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-11 14:32:53 -07:00
Jim Galasyn f207a54260 Add LDAP description and example (#4581) 2017-09-11 11:53:49 -07:00
Joao Fernandes 78cd5a3ecf Fix issues around UCP, DTR, content trust (#4558)
* Explain behavior with UCP and DCT

* Disable DCT before upgrading DTR
2017-09-08 10:48:47 -07:00
Jim Galasyn 36910ffc1d Update Add Node screenshot (#4550) 2017-09-07 13:30:16 -07:00
Jim Galasyn fbd515db0e Add explanation of default role for new users (#4515)
* Add explanation of default role for new users

* Incorporate feedback
2017-09-05 18:08:38 -07:00
Jim Galasyn e9101f07d2 Add topic on session settings (#4511)
* Add topic on session settings

* Incorporated feedback
2017-09-05 12:43:14 -07:00
Jim Galasyn 115ccf10b4 Add es tag (#4482) 2017-08-31 16:44:50 -07:00
Jim Galasyn c6d413a8c4 Update LDAP screenshot and UI descriptions (#4435) 2017-08-29 17:09:38 -07:00
Joao Fernandes 843d8ab430 Fix broken link (#4432) 2017-08-29 15:55:05 -07:00
Jim Galasyn c316fd3f2c Fix link to DTR install topic (#4383) 2017-08-25 13:58:14 -07:00
Joao Fernandes 768fd32262 Remove internal flag from UCP 2017-08-21 09:44:52 -07:00
Joao Fernandes 1fa5f5988d Refactor rbac topics (#4229)
* Refactor rbac topics

* Make headings sentence case
2017-08-17 08:36:18 -07:00
Jim Galasyn fa7b36c629 Update versions to GA; remove Beta admonitions (#232) 2017-08-15 23:31:15 -07:00
Jim Galasyn 3de302c121 Bump ee version (#221) 2017-08-15 23:31:15 -07:00