Commit Graph

118 Commits

Author SHA1 Message Date
Maria Bermudez
ae9c87e741 Merge content from public and private master branches (#1120) 2019-05-31 13:31:06 -04:00
Maria Bermudez
a1074ebff3 Sync published with master (#8778)
* Fixed syntax error (#8732)

Last edit to the REPLICA_ID command introduced a syntax error by adding an extra ')'. Removed it.

* Fix replica ID setting examples

- Accept suggestion from @thajeztah based on product testing
- Apply change to page examples
- Remove NFS backup example based on the following errors: 
tar: /var/lib/docker/volumes/dtr-registry-nfs-36e6bf87816d: Cannot stat: No such file or directory
tar: Exiting with failure status due to previous errors

* Update header for example tar

* Fixed link title

* Added new example and deprecation info (#8773)

* Updated multi-stage build doc (#8769)

Changed the 'as' keyword to 'AS' to match the Dockerfile reference docs here: https://docs.docker.com/engine/reference/builder/#from

* Fix typo (#8766)

* Fixed a sentence (#8728)

* Minor edit

* Update configure-tls.md (#8719)

* Update upgrade.md (#8718)

* Update index.md (#8717)

* Update configure-tls.md (#8716)

* Add TOC entry for Hub page title change (#8777)

* Update upgrade.md

* Fix left navigation TOC

* Update get-started.md (#8713)

* Update tmpfs.md (#8711)

* Add an indentation in compose-gettingstarted.md (#8487)

* Fix messaging on service dependencies
2019-05-07 18:17:46 -07:00
Maria Bermudez
04601b4e13 Sync published with master (#8709)
* Sync published with master (#8693) (#8694)

* Adding Azure note (#8566)

* Rephrase additional line and update link

* Revert "Netlify redirects interlock (#8595)"

This reverts commit a7793edc74.

* UCP Install on Azure Patch (#8522)

* Improved backup commands (#8597)

* Improved backup commands

DTR image backup command improvements:

1. Local and NFS mount image backup commands were invalid (incorrectly used -C flag). Replaced them with commands that work.
2. The new commands automatically populate the correct replica ID and add a datestamp to the backup filename.

DTR Metadata backup command improvements:

DTR metadata backups are more difficult than they need to be and generate many support tickets. I updated the DTR command to avoid common user pitfalls:

1. The prior metadata backup command was subject to user error. Improved the command to automatically collect the DTR version and select a replica. 
2. Improved security of the command by automatically collecting UCP CA certificate for verification rather than using --ucp-insecure-tls flag. 
3. Improved the backup filename by adding the backed-up version information and date of backup. Knowledge of the version information is required for restoring a backup.
4. Described these improvements for the user.

Image backup commands were tested with local and NFS image storage. The metadata backup command was tested by running it directly on a DTR node and through a UCP client bundle with multiple replicas.

* Technical and editorial review

* More edits

* line 8; remove unnecessary a (#8672)

* line 8; remove unnecessary a

* Minor edit

* Updated the UCP Logging page to include UCP 3.1 screenshots (#8646)

* Added examples (#8599)

* Added examples

Added examples with more detail and automation to help customers backup DTR without creating support tickets.

* Linked to explanation of example command

@omegamormegil I removed the example with prepopulated fields, as I think it doesn't add much, and will only add confusion. Users who need this much detail can run the basic command and follow the terminal prompts. 

We can re-add in a follow-up PR, if you think that example is crucial to this page.

* Remove deadlink in the Interlock ToC (#8668)

* Found a deadlink in the Interlock ToC

* Added Redirect

* Published (#8674)

* add slack webhook to Jenkinsfile

* make jenkinsfile serve private and public docs

After a couple of Jenkins-based mix-ups it became obvious we needed a Jenkinsfile that would serve both public and private projects, that we could move between repos without worry. This Jenkinsfile knows which images to build and push and which swarm services to update because of the use of git_url and branch conditions.

* Sync published with master (#8619)

* Update install.md

add note: 8 character password minimum length

* Include Ubuntu version in Dockerfile

more recent versions of Ubuntu don't work with the given Dockerfile

* Updated the 3.1.4 release notes to include Centos 7.6 support

* Remove redundant "be"

* Update the "role-based access control" link

On page "https://docs.docker.com/ee/ucp/user-access/", update the hyperlink "role-based access control" to point to "https://docs.docker.com/ee/ucp/authorization/" instead of "https://docs.docker.com/ee/access-control".

* Add UCP user password limitation

* Revert "Updated the UCP 3.1.4 release notes to include Centos 7.6 support"

* Adding emphasis on Static IP requirement (#7276)

* Adding emphasis on Static IP requirement

We had a customer (00056641) who changed IPs like this all at once, and they are in a messy status.    We should make it clear that static IP is absolutely required.  
```***-ucp-0-dw original="10.15.89.6" updated="10.15.89.7" 
***-ucp-1-dw original="10.15.89.5" updated="10.15.89.6" 
***-ucp-2-dw original="10.15.89.7" updated="10.15.89.5" ```

* Link to prod requirement of static IP addresses

* Adding warning about layer7 config (#8617)

* Adding warning about layer7 config

Adding warning about layer7 config not being included in the backup

* Text edit

* Sync published with master (#8673)

* Revert "Netlify redirects interlock (#8595)"

This reverts commit a7793edc74.

* UCP Install on Azure Patch (#8522)

* Improved backup commands (#8597)

* line 8; remove unnecessary a (#8672)


* Updated the UCP Logging page to include UCP 3.1 screenshots (#8646)

* Added examples (#8599)

* Remove deadlink in the Interlock ToC (#8668)

* Trying to fix command rendering of '--format "{{ .Names }}"' (#8678)

* interlock --> ucp-interlock (#8675)

* Fixed code samples 

- Use the latest UCP version and the latest ucp-interlock image
- Leverage ucp page version Jekyll variable

* Typo

* Final syntax fix

* Update backup.md

* Removed Reference to Interlock Preview Image, and added relevant UCP Image Org and Tag

* Fix syntax error which caused the master build to fail

* docs: fix typo in removal of named volumes (#8686)

* Updated the ToC for Upgrading Interlock

* Update index.md (#8690)

Fix typo - missing word.

* Update bind-mounts.md (#8696)

* Minor edits (#8708)

* Minor edits

- Standardized setting of replica ID as per @caervs 
- Fix broken link

* Consistency edits

- Standardized setting of replica ID
- Added note that this command only works on Linux

* Standardize replica setting

- Update commands for creating tar files for local and NFS-mounted images
2019-04-23 18:01:31 -06:00
Maria Bermudez
145eab42c1 Sync published with master (#8695)
* Sync published with master (#8693) (#8694)

* Adding Azure note (#8566)

* Adding Azure note

* Rephrase additional line and update link

* Revert "Netlify redirects interlock (#8595)"

This reverts commit a7793edc74.

* UCP Install on Azure Patch (#8522)

* Fix grammar on the 2nd pre-req, and did markdown formatting on the rest :)

* Correct Pod-CIDR Warning

* Content cleanup

Please check that I haven't changed the meaning of the updated prerequisites.

* Create a new section on configuring the IP Count value, also responded to feedback from Follis, Steve R and Xinfeng.

* Incorporated Steven F's feedback and Issue 8551

* Provide a warning when setting a small IP Count variable

* Final edits

* Update install-on-azure.md

* Following feedback I have expanded on the 0644 azure.json file permissions and Added the --existing-config file to the UCP install command

* Removed Orchestrator Tag Pre Req from Azure Docs

* Clarifying need for 0644 permissions

* Improved backup commands (#8597)

* Improved backup commands

DTR image backup command improvements:

1. Local and NFS mount image backup commands were invalid (incorrectly used -C flag). Replaced them with commands that work.
2. The new commands automatically populate the correct replica ID and add a datestamp to the backup filename.

DTR Metadata backup command improvements:

DTR metadata backups are more difficult than they need to be and generate many support tickets. I updated the DTR command to avoid common user pitfalls:

1. The prior metadata backup command was subject to user error. Improved the command to automatically collect the DTR version and select a replica. 
2. Improved security of the command by automatically collecting UCP CA certificate for verification rather than using --ucp-insecure-tls flag. 
3. Improved the backup filename by adding the backed-up version information and date of backup. Knowledge of the version information is required for restoring a backup.
4. Described these improvements for the user.

Image backup commands were tested with local and NFS image storage. The metadata backup command was tested by running it directly on a DTR node and through a UCP client bundle with multiple replicas.

* Technical and editorial review

* More edits

* line 8; remove unnecessary a (#8672)

* line 8; remove unnecessary a

* Minor edit

* Updated the UCP Logging page to include UCP 3.1 screenshots (#8646)

* Added examples (#8599)

* Added examples

Added examples with more detail and automation to help customers backup DTR without creating support tickets.

* Linked to explanation of example command

@omegamormegil I removed the example with prepopulated fields, as I think it doesn't add much, and will only add confusion. Users who need this much detail can run the basic command and follow the terminal prompts. 

We can re-add in a follow-up PR, if you think that example is crucial to this page.

* Remove deadlink in the Interlock ToC (#8668)

* Found a deadlink in the Interlock ToC

* Added Redirect

* Published (#8674)

* add slack webhook to Jenkinsfile

* make jenkinsfile serve private and public docs

After a couple of Jenkins-based mix-ups it became obvious we needed a Jenkinsfile that would serve both public and private projects, that we could move between repos without worry. This Jenkinsfile knows which images to build and push and which swarm services to update because of the use of git_url and branch conditions.

* Sync published with master (#8619)

* Update install.md

add note: 8 character password minimum length

* Include Ubuntu version in Dockerfile

more recent versions of Ubuntu don't work with the given Dockerfile

* Updated the 3.1.4 release notes to include Centos 7.6 support

* Remove redundant "be"

* Update the "role-based access control" link

On page "https://docs.docker.com/ee/ucp/user-access/", update the hyperlink "role-based access control" to point to "https://docs.docker.com/ee/ucp/authorization/" instead of "https://docs.docker.com/ee/access-control".

* Add UCP user password limitation

* Revert "Updated the UCP 3.1.4 release notes to include Centos 7.6 support"

* Adding emphasis on Static IP requirement (#7276)

* Adding emphasis on Static IP requirement

We had a customer (00056641) who changed IPs like this all at once, and they are in a messy status.    We should make it clear that static IP is absolutely required.  
```***-ucp-0-dw original="10.15.89.6" updated="10.15.89.7" 
***-ucp-1-dw original="10.15.89.5" updated="10.15.89.6" 
***-ucp-2-dw original="10.15.89.7" updated="10.15.89.5" ```

* Link to prod requirement of static IP addresses

* Adding warning about layer7 config (#8617)

* Adding warning about layer7 config

Adding warning about layer7 config not being included in the backup

* Text edit

* Sync published with master (#8673)

* Revert "Netlify redirects interlock (#8595)"

This reverts commit a7793edc74.

* UCP Install on Azure Patch (#8522)

* Fix grammar on the 2nd pre-req, and did markdown formatting on the rest :)

* Correct Pod-CIDR Warning

* Content cleanup

Please check that I haven't changed the meaning of the updated prerequisites.

* Create a new section on configuring the IP Count value, also responded to feedback from Follis, Steve R and Xinfeng.

* Incorporated Steven F's feedback and Issue 8551

* Provide a warning when setting a small IP Count variable

* Final edits

* Update install-on-azure.md

* Following feedback I have expanded on the 0644 azure.json file permissions and Added the --existing-config file to the UCP install command

* Removed Orchestrator Tag Pre Req from Azure Docs

* Clarifying need for 0644 permissions

* Improved backup commands (#8597)

* Improved backup commands

DTR image backup command improvements:

1. Local and NFS mount image backup commands were invalid (incorrectly used -C flag). Replaced them with commands that work.
2. The new commands automatically populate the correct replica ID and add a datestamp to the backup filename.

DTR Metadata backup command improvements:

DTR metadata backups are more difficult than they need to be and generate many support tickets. I updated the DTR command to avoid common user pitfalls:

1. The prior metadata backup command was subject to user error. Improved the command to automatically collect the DTR version and select a replica. 
2. Improved security of the command by automatically collecting UCP CA certificate for verification rather than using --ucp-insecure-tls flag. 
3. Improved the backup filename by adding the backed-up version information and date of backup. Knowledge of the version information is required for restoring a backup.
4. Described these improvements for the user.

Image backup commands were tested with local and NFS image storage. The metadata backup command was tested by running it directly on a DTR node and through a UCP client bundle with multiple replicas.

* Technical and editorial review

* More edits

* line 8; remove unnecessary a (#8672)

* line 8; remove unnecessary a

* Minor edit

* Updated the UCP Logging page to include UCP 3.1 screenshots (#8646)

* Added examples (#8599)

* Added examples

Added examples with more detail and automation to help customers backup DTR without creating support tickets.

* Linked to explanation of example command

@omegamormegil I removed the example with prepopulated fields, as I think it doesn't add much, and will only add confusion. Users who need this much detail can run the basic command and follow the terminal prompts. 

We can re-add in a follow-up PR, if you think that example is crucial to this page.

* Remove deadlink in the Interlock ToC (#8668)

* Found a deadlink in the Interlock ToC

* Added Redirect

* Trying to fix command rendering of '--format "{{ .Names }}"' (#8678)

* Trying to fix command rendering of '--format "{{ .Names }}"'

--format "{{ .Names }}" is showing up in the markup but is rendering as --format "" in the published version. Added {% raw %} tags to try to fix.

* Fixed heading inconsistency

* Trying to fix command rendering of '--format "{{ .Names }}"' (#8677)

* Trying to fix command rendering of '--format "{{ .Names }}"'

--format "{{ .Names }}" is showing up in the markup but is rendering as --format "" in the published version. Added {% raw %} tags to try to fix.

* Update concatenated to chained

* Minor fix

* interlock --> ucp-interlock (#8675)

* interlock --> ucp-interlock

* Fixed code samples 

- Use the latest UCP version and the latest ucp-interlock image
- Leverage ucp page version Jekyll variable

* Typo

* Final syntax fix

* Update backup.md

* Removed Reference to Interlock Preview Image, and added relevant UCP Image Org and Tag

* Fix syntax error which caused the master build to fail

* docs: fix typo in removal of named volumes (#8686)
2019-04-22 18:53:09 -06:00
Sagar Velankar
8781ea5cbc Remove extra which
Change below line

From

AUFS, which can suffer noticeable latencies when searching for files in images with many layers

To

AUFS can suffer noticeable latencies when searching for files in images with many layers
2019-04-14 21:33:44 +05:30
Sebastiaan van Stijn
21c45858b0 Fix some minor issues in vfs storage-driver section
- Fix mention of `storage-drivers` instead of `storage-opts`
- Repeat the selected driver in the second `daemon.json` example
- Remove mention of `CE` as this driver can be used
  on Docker EE (although it's mainly intending for
  debugging, so not a "supported" driver)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-27 14:52:18 +01:00
Maria Bermudez
d3afe5ed0d Merge pull request #7495 from omegamormegil/patch-8
NFS volume with service create
2019-03-15 15:17:13 -07:00
Maria Bermudez
eb6aa08e8a Fix service name 2019-03-15 15:16:59 -07:00
Maria Bermudez
66dda9ef20 Add NFS example 2019-03-15 15:15:37 -07:00
Sebastiaan van Stijn
ec7e716c54 Clean up some old setup information for overlayFS
This removes the additional steps for old versions of Docker EE 17.06.
Current versions of Docker EE 17.06 no longer need these additional
steps.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-05 13:41:55 +01:00
L-Hudson
115ededf56 Merge pull request #8205 from dmandalidis/overlay-reword
Overlay driver note rewording (fixes #38695)
2019-02-20 10:35:52 -05:00
Dimitris Mandalidis
bdc863005a Overlay driver note rewording (fixes #38695) 2019-02-09 11:45:59 +02:00
Sebastiaan van Stijn
03d5b3396d Use consistent formatting for notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-09 00:49:57 +01:00
L-Hudson
6839b76f68 Merge pull request #6449 from DanHam/fix-device-mapper-doc
Fix device mapper doc
2019-01-23 15:28:43 -05:00
L-Hudson
d8c1b5c452 Update device-mapper-driver.md
minor editorial crx
2019-01-23 15:20:53 -05:00
Anne Henmi
dbe3c68ba5 Update device-mapper-driver.md
added comma
2019-01-22 16:14:09 -07:00
Sebastiaan van Stijn
7002b9c5c2 Merge pull request #8006 from thaJeztah/remove_edge_reference_docs
Remove edge documentation
2019-01-18 19:13:58 +01:00
Maria Bermudez
7a993f7b65 Merge pull request #6822 from lvthillo/patch-1
Update device-mapper-driver.md
2019-01-15 17:04:34 -08:00
Josh Sleeper
4c5b491d31 chore(typo): fix incorrect storage driver reference 2019-01-15 15:37:17 -05:00
Sebastiaan van Stijn
aae9bfc276 Rename / remove edge-related variables
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-14 22:44:58 +01:00
paigehargrave
4bc888a9c2 Update bind-mounts.md 2019-01-11 15:59:42 -05:00
paigehargrave
77077e06a3 Update index.md 2019-01-11 15:10:34 -05:00
paigehargrave
3a97eec35a Update select-storage-driver.md 2019-01-11 14:17:16 -05:00
ada mancini
ce588a5df4 Update device-mapper-driver.md
callout json-file functionality when using devicemapper - json-file logs to docker dataroot not devicemapper volumes
2018-12-19 17:29:51 -05:00
Maria Bermudez
4bdcbf8ae9 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-10 12:41:24 -08:00
Mark Janssen
8783864b54 Fix XFS 'ftype' option typo
The required XFS option is called ftype, not fstype:

```
xfs_info / | grep ftype
naming   =version 2              bsize=4096   ascii-ci=0 ftype=1
```
2018-12-08 17:41:58 +01:00
Anne Henmi
14f78649ab Merge pull request #900 from docker/mountflags-zfs-899
Added a note on ZFS/MountFlags=slave
2018-12-07 10:05:21 -07:00
Anne Henmi
48ce1ddfd8 Update zfs-driver.md
Technical review complete by @andrewhsu.
2018-12-04 12:57:04 -07:00
Anne Henmi
a5f1d88deb Initial draft. 2018-11-30 10:15:46 -07:00
Brandon Mitchell
906a91f5ea Data exists in stopped containers, but not removed containers
Signed-off-by: Brandon Mitchell <git@bmitch.net>
2018-11-16 07:34:20 -05:00
Anne Henmi
3805b23d93 Update select-storage-driver.md
Fixed product naming
2018-11-13 13:20:33 -07:00
Anne Henmi
e7cbb50923 Update select-storage-driver.md 2018-11-13 12:45:59 -07:00
Maria Bermudez
3d7a90acb1 Minor edits 2018-11-13 11:05:43 -08:00
Anne Henmi
f0c93ff968 Update select-storage-driver.md 2018-11-13 11:45:01 -07:00
Anne Henmi
48f9a7e09d Update select-storage-driver.md 2018-11-13 10:12:53 -07:00
Sebastiaan van Stijn
3b2495966a Update "select a storage driver" with current status
The information on this page was a bit outdated, and
with "overlay" and "devicemapper" being phased-out, could
use some changes;

- de-emphasize "overlay", "devicemapper" and "aufs"
- split "recommended" and "alternative drivers" columns
  (vfs was listed as a "recommended" driver, but definitely
  is not recommended for production use).
- add notes about "overlay" and "devicemapper" being
  deprecated in Docker 18.09
- some other textual changes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-13 18:04:10 +01:00
Nathan Jones
00e913e648 NFS volume with service create
Added example. There aren't many good examples using NFS with service create in the docs and this is a common customer question.
2018-10-11 16:04:08 -04:00
Maria Bermudez
eb608ee28d Merge branch 'master' into spelling 2018-10-04 12:18:34 -07:00
Sebastiaan van Stijn
9124018691 Merge pull request #7432 from BretFisher/patch-4
Correct container write layer persistence statement
2018-10-02 11:18:49 +02:00
Maria Bermudez
bc9d3a4348 Merge pull request #7430 from BretFisher/patch-2
Fixing link from storage drivers page to volumes page
2018-10-01 13:37:15 -07:00
Bret Fisher
261bd20697 adding oxford comma 2018-09-27 04:50:59 -04:00
Bret Fisher
95d49df03d Correct container write layer persistence statement
Make it more clear that container storage file changes are persistent until the container is deleted, rather than the container stopped. This now matches statements later in the document.
2018-09-27 04:11:53 -04:00
Bret Fisher
4b39f91fb0 remove aufs "default storage driver" statements
In many cases, aufs is no longer the default storage driver, so just change the example to not mention the default. If you'd like it to actually state overlay2 is the default in most/some cases I can change that.
2018-09-27 04:11:47 -04:00
Bret Fisher
afaa1a174d Fixing link to volumes
Link to specific volumes page rather than storage summary page.
2018-09-27 03:37:12 -04:00
Anne Henmi
3c01dfe6b2 Merge pull request #7333 from corburn/patch-1
Update zfs-driver.md
2018-09-26 08:45:05 -06:00
Maria Bermudez
4ede4f8558 Update overlayfs-driver.md
Update "referred to a" to "referred to as a"
2018-09-25 07:52:16 -07:00
Maria Bermudez
95fd472135 Update overlayfs-driver.md
Change "referred to a" to "referred to as a"
2018-09-25 07:40:43 -07:00
Maria Bermudez
12ece3c317 Update aufs-driver.md
Fix grammar
2018-09-25 07:22:19 -07:00
Maria Bermudez
bedfc702a8 Update bind-mounts.md
Add a comma
2018-09-25 07:21:48 -07:00
包梦江
bb3da81f62 chore(*): fix typo 2018-09-25 11:28:06 +08:00