Commit Graph

52555 Commits

Author SHA1 Message Date
paigehargrave 9ec07b82b9
DTR API info 2019-05-23 12:44:01 -04:00
Paige Hargrave d8959657fa Add DTR API 2019-05-23 12:31:39 -04:00
Paige Hargrave bdb6a7785f Add CLI 2019-05-23 12:28:16 -04:00
Paige Hargrave da18e3600e Add API 2019-05-23 12:26:53 -04:00
Usha Mandya ac099018c1
Merge pull request #8609 from davidism/patch-1
Update Python and Flask usage in Compose tutorial
2019-05-23 09:54:13 +01:00
Maria Bermudez 52e081c767
Sync published with master (#8839)
* updated Layer 7 UI image to have correct http port, updated deployment steps to make it clear what can be done via the UI and the alternative manualy approach

Signed-off-by: Steve Richards <steve.james.richards@gmail.com>

* Propose 3 as the number of manager nodes (#8827)

* Propose 3 as the number of manager nodes

Propose 3 managers as the default number of manager nodes.

* Minor style updates

* typeo in document and small update to image (#8837)

* Fix typos (#8650)

* remove extra 'but' on line 40 (#8626)
2019-05-22 18:38:13 -07:00
Carlton Caven cbc9539e94 remove extra 'but' on line 40 (#8626) 2019-05-22 11:57:22 -07:00
D. Domig 8b8107e3b7 Fix typos (#8650) 2019-05-22 11:56:34 -07:00
steve richards dd33a5c96a typeo in document and small update to image (#8837) 2019-05-22 11:46:52 -07:00
David Yu c38df34383 Propose 3 as the number of manager nodes (#8827)
* Propose 3 as the number of manager nodes

Propose 3 managers as the default number of manager nodes.

* Minor style updates
2019-05-22 11:46:11 -07:00
paigehargrave 275fd1c657
Merge pull request #8836 from stevejr/interlock-deploy-updates
Updated Interlock deploy page
2019-05-22 14:04:03 -04:00
paigehargrave f71332d5d2
Image and syntax fixes 2019-05-22 08:31:12 -04:00
Steve Richards 90972eb210 updated Layer 7 UI image to have correct http port, updated deployment steps to make it clear what can be done via the UI and the alternative manualy approach
Signed-off-by: Steve Richards <steve.james.richards@gmail.com>
2019-05-22 12:50:01 +01:00
Maria Bermudez e678ad3f1b
Sync published with master (#8829)
* Add deprecation notice for Hub discovery (#8828)

* Hub Swarm discovery service deprecation

Document the deprecation

Add warning graphic

Fix formatting
2019-05-21 19:26:44 -07:00
Maria Bermudez 113cd10c68
Add deprecation notice for Hub discovery (#8828)
* Hub Swarm discovery service deprecation

Document the deprecation

Add warning graphic

Fix formatting
2019-05-21 19:25:08 -07:00
Usha Mandya 35ef1f992c
Merge pull request #1096 from usha-mandya/app-reference
Adding App CLI reference docs
2019-05-21 14:41:07 +01:00
usha-mandya 4045e5a9ee Adding App CLI reference docs 2019-05-21 14:28:15 +01:00
Usha Mandya 74a16f2eaf
Merge pull request #1053 from nigelpoulton/nigel-context-betadocs
Adding Docker Context customer beta2 user guide
2019-05-21 14:00:32 +01:00
Usha Mandya ceb1a99b70
editorial updates 2019-05-21 13:48:34 +01:00
Usha Mandya 5979a99b1f
Merge pull request #1071 from thaJeztah/assemble_reference
Add docker assemble reference docs
2019-05-21 13:17:25 +01:00
Sebastiaan van Stijn b6a33aa575
Add assemble reference docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-21 13:11:13 +02:00
Usha Mandya 9c41dff669
Merge pull request #1081 from usha-mandya/app-templates-1006
Updated the toc, fixed table format
2019-05-21 11:40:16 +01:00
Maria Bermudez e98f75aff4
Published into master (#8824)
* Sync published with master (#8822)

* Updated Windows Release that supports Kubernetes

Changed from old outdated Edge release to reflect use of a stable release.  Kubernetes page actually reflects this version as well (so its an error on this page only).

* Interlock link fixes (#8798)

* Remove outdated links/fix links

* Next steps link fix

* Next steps link fixes

* Logging driver 920 (#8625)

* Logging driver port from vnext-engine

* Update json-file.md

* Update json-file.md

* Port changes from vnext-engine

* Updates based on feedback

* Added note back in

* Added note back in

* Added limitations per Anusha

* New dual logging info

* Added link to new topic

Needs verification.

* Changes per feedback.

* Updates per feedback

* Updates per feedback

* Updated 20m

* Added CE version

* Added missing comma

* Updates per feedback

* Add raw tag
Add TOC entry - subject to change

* Add entry for local logging driver

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Updates per feedback

* Updates per feedback

* Update zfs-driver.md (#8735)

* Update zfs-driver.md

* Add suggested correction

* Removed HA Proxy Link

* Added Azure Disk and Azure File Storage for UCP Workloads (#8774)

* Added Azure Disk and Azure File

I have added Azure Disk and Azure file documentation for use with UCP
3.0 or newer.

* Added the Azure Disk Content
* Added the Azure File Content
* Updated the Toc to include Azure Disk and Azure File

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Responding to feedback, inc changing Azure File to Azure Files

Following on from Steven and Deeps feedback this commit addresses those
nits. Including changing `Operators` to `Platform Operators`, switching
`Azure File` to `Azure Files` and many small formating changes.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Minor style updates

* Minor style updates

* Final edits

* Removed Ubuntu 14.04 warnings from Docker UCP install Page (#8804)

We dropped support for Ubuntu 14.04 in Enterprise 2.1 / UCP 3.1, however
the installation instructions still carry 14.04 warnings.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Fix broken link (#8801)

* ubuntu.md: remove old docker-ce-cli (#8665)

I hit the following error when "upgrading" docker-ce 18.09 to docker-ee 17.06:

> dpkg: error processing archive /var/cache/apt/archives/docker-ee_3%3a17.06.2~ee~19~3-0~ubuntu_amd64.deb (--unpack):
 trying to overwrite '/usr/share/fish/vendor_completions.d/docker.fish', which is also in package docker-ce-cli 5:18.09.4~2.1.rc1-0~ubuntu-xenial

This commit adds `docker-ce-cli` to the list in "uninstall old packages" to fix this.

* Updated UCP CLI Reference to 3.1.7 (#8805)

-Updated all of the UCP 3.1.7 references.
-Alphabeticalised each reference
-Added very a value is expected or not after each variable.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Fix numbering issue

* Fix formatting

* Added UCP Kubernetes Secure RBAC Defaults (#8810)

* Added Kubernetes Secure RBAC Defaults

* Style updates

* Final edits

* Sync published with master (#8823)

* Updated Windows Release that supports Kubernetes

Changed from old outdated Edge release to reflect use of a stable release.  Kubernetes page actually reflects this version as well (so its an error on this page only).

* Interlock link fixes (#8798)

* Remove outdated links/fix links

* Next steps link fix

* Next steps link fixes

* Logging driver 920 (#8625)

* Logging driver port from vnext-engine

* Update json-file.md

* Update json-file.md

* Port changes from vnext-engine

* Updates based on feedback

* Added note back in

* Added note back in

* Added limitations per Anusha

* New dual logging info

* Added link to new topic

Needs verification.

* Changes per feedback.

* Updates per feedback

* Updates per feedback

* Updated 20m

* Added CE version

* Added missing comma

* Updates per feedback

* Add raw tag
Add TOC entry - subject to change

* Add entry for local logging driver

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Updates per feedback

* Updates per feedback

* Update zfs-driver.md (#8735)

* Update zfs-driver.md

* Add suggested correction

* Removed HA Proxy Link

* Added Azure Disk and Azure File Storage for UCP Workloads (#8774)

* Added Azure Disk and Azure File

I have added Azure Disk and Azure file documentation for use with UCP
3.0 or newer.

* Added the Azure Disk Content
* Added the Azure File Content
* Updated the Toc to include Azure Disk and Azure File

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Responding to feedback, inc changing Azure File to Azure Files

Following on from Steven and Deeps feedback this commit addresses those
nits. Including changing `Operators` to `Platform Operators`, switching
`Azure File` to `Azure Files` and many small formating changes.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Minor style updates

* Minor style updates

* Final edits

* Removed Ubuntu 14.04 warnings from Docker UCP install Page (#8804)

We dropped support for Ubuntu 14.04 in Enterprise 2.1 / UCP 3.1, however
the installation instructions still carry 14.04 warnings.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Fix broken link (#8801)

* ubuntu.md: remove old docker-ce-cli (#8665)

I hit the following error when "upgrading" docker-ce 18.09 to docker-ee 17.06:

> dpkg: error processing archive /var/cache/apt/archives/docker-ee_3%3a17.06.2~ee~19~3-0~ubuntu_amd64.deb (--unpack):
 trying to overwrite '/usr/share/fish/vendor_completions.d/docker.fish', which is also in package docker-ce-cli 5:18.09.4~2.1.rc1-0~ubuntu-xenial

This commit adds `docker-ce-cli` to the list in "uninstall old packages" to fix this.

* Updated UCP CLI Reference to 3.1.7 (#8805)

-Updated all of the UCP 3.1.7 references.
-Alphabeticalised each reference
-Added very a value is expected or not after each variable.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Fix numbering issue

* Fix formatting

* Added UCP Kubernetes Secure RBAC Defaults (#8810)

* Added Kubernetes Secure RBAC Defaults

* Style updates

* Final edits
2019-05-20 19:57:56 -07:00
Maria Bermudez c1c16553b6 Merge branch 'published' of github.com:docker/docker.github.io into published 2019-05-20 19:53:33 -07:00
Maria Bermudez 3907e53a03
Sync published with master (#8823)
* Updated Windows Release that supports Kubernetes

Changed from old outdated Edge release to reflect use of a stable release.  Kubernetes page actually reflects this version as well (so its an error on this page only).

* Interlock link fixes (#8798)

* Remove outdated links/fix links

* Next steps link fix

* Next steps link fixes

* Logging driver 920 (#8625)

* Logging driver port from vnext-engine

* Update json-file.md

* Update json-file.md

* Port changes from vnext-engine

* Updates based on feedback

* Added note back in

* Added note back in

* Added limitations per Anusha

* New dual logging info

* Added link to new topic

Needs verification.

* Changes per feedback.

* Updates per feedback

* Updates per feedback

* Updated 20m

* Added CE version

* Added missing comma

* Updates per feedback

* Add raw tag
Add TOC entry - subject to change

* Add entry for local logging driver

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Updates per feedback

* Updates per feedback

* Update zfs-driver.md (#8735)

* Update zfs-driver.md

* Add suggested correction

* Removed HA Proxy Link

* Added Azure Disk and Azure File Storage for UCP Workloads (#8774)

* Added Azure Disk and Azure File

I have added Azure Disk and Azure file documentation for use with UCP
3.0 or newer.

* Added the Azure Disk Content
* Added the Azure File Content
* Updated the Toc to include Azure Disk and Azure File

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Responding to feedback, inc changing Azure File to Azure Files

Following on from Steven and Deeps feedback this commit addresses those
nits. Including changing `Operators` to `Platform Operators`, switching
`Azure File` to `Azure Files` and many small formating changes.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Minor style updates

* Minor style updates

* Final edits

* Removed Ubuntu 14.04 warnings from Docker UCP install Page (#8804)

We dropped support for Ubuntu 14.04 in Enterprise 2.1 / UCP 3.1, however
the installation instructions still carry 14.04 warnings.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Fix broken link (#8801)

* ubuntu.md: remove old docker-ce-cli (#8665)

I hit the following error when "upgrading" docker-ce 18.09 to docker-ee 17.06:

> dpkg: error processing archive /var/cache/apt/archives/docker-ee_3%3a17.06.2~ee~19~3-0~ubuntu_amd64.deb (--unpack):
 trying to overwrite '/usr/share/fish/vendor_completions.d/docker.fish', which is also in package docker-ce-cli 5:18.09.4~2.1.rc1-0~ubuntu-xenial

This commit adds `docker-ce-cli` to the list in "uninstall old packages" to fix this.

* Updated UCP CLI Reference to 3.1.7 (#8805)

-Updated all of the UCP 3.1.7 references.
-Alphabeticalised each reference
-Added very a value is expected or not after each variable.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Fix numbering issue

* Fix formatting

* Added UCP Kubernetes Secure RBAC Defaults (#8810)

* Added Kubernetes Secure RBAC Defaults

* Style updates

* Final edits
2019-05-20 19:42:51 -07:00
Maria Bermudez be059a0c15
Sync published with master (#8822)
* Updated Windows Release that supports Kubernetes

Changed from old outdated Edge release to reflect use of a stable release.  Kubernetes page actually reflects this version as well (so its an error on this page only).

* Interlock link fixes (#8798)

* Remove outdated links/fix links

* Next steps link fix

* Next steps link fixes

* Logging driver 920 (#8625)

* Logging driver port from vnext-engine

* Update json-file.md

* Update json-file.md

* Port changes from vnext-engine

* Updates based on feedback

* Added note back in

* Added note back in

* Added limitations per Anusha

* New dual logging info

* Added link to new topic

Needs verification.

* Changes per feedback.

* Updates per feedback

* Updates per feedback

* Updated 20m

* Added CE version

* Added missing comma

* Updates per feedback

* Add raw tag
Add TOC entry - subject to change

* Add entry for local logging driver

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Update config/containers/logging/configure.md

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Updates per feedback

* Updates per feedback

* Update zfs-driver.md (#8735)

* Update zfs-driver.md

* Add suggested correction

* Removed HA Proxy Link

* Added Azure Disk and Azure File Storage for UCP Workloads (#8774)

* Added Azure Disk and Azure File

I have added Azure Disk and Azure file documentation for use with UCP
3.0 or newer.

* Added the Azure Disk Content
* Added the Azure File Content
* Updated the Toc to include Azure Disk and Azure File

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Responding to feedback, inc changing Azure File to Azure Files

Following on from Steven and Deeps feedback this commit addresses those
nits. Including changing `Operators` to `Platform Operators`, switching
`Azure File` to `Azure Files` and many small formating changes.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Minor style updates

* Minor style updates

* Final edits

* Removed Ubuntu 14.04 warnings from Docker UCP install Page (#8804)

We dropped support for Ubuntu 14.04 in Enterprise 2.1 / UCP 3.1, however
the installation instructions still carry 14.04 warnings.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Fix broken link (#8801)

* ubuntu.md: remove old docker-ce-cli (#8665)

I hit the following error when "upgrading" docker-ce 18.09 to docker-ee 17.06:

> dpkg: error processing archive /var/cache/apt/archives/docker-ee_3%3a17.06.2~ee~19~3-0~ubuntu_amd64.deb (--unpack):
 trying to overwrite '/usr/share/fish/vendor_completions.d/docker.fish', which is also in package docker-ce-cli 5:18.09.4~2.1.rc1-0~ubuntu-xenial

This commit adds `docker-ce-cli` to the list in "uninstall old packages" to fix this.

* Updated UCP CLI Reference to 3.1.7 (#8805)

-Updated all of the UCP 3.1.7 references.
-Alphabeticalised each reference
-Added very a value is expected or not after each variable.

Signed-off-by: Olly Pomeroy <olly@docker.com>

* Fix numbering issue

* Fix formatting

* Added UCP Kubernetes Secure RBAC Defaults (#8810)

* Added Kubernetes Secure RBAC Defaults

* Style updates

* Final edits
2019-05-20 18:53:05 -07:00
Maria Bermudez 1e70f827e9
Merge branch 'published' into master 2019-05-20 18:52:41 -07:00
Olly P ea36af4f2d Added UCP Kubernetes Secure RBAC Defaults (#8810)
* Added Kubernetes Secure RBAC Defaults

* Style updates

* Final edits
2019-05-20 18:51:16 -07:00
Maria Bermudez 0610e910e9 Fix broken link 2019-05-20 16:41:32 -07:00
Maria Bermudez a5cad88db7
Fix formatting 2019-05-20 13:33:25 -07:00
Maria Bermudez 3e2cbd18f6 Clean up before publishing backup and restore 2019-05-20 12:49:55 -07:00
Maria Bermudez 87a3d51654 Merge branch 'amberjack' of github.com:bermudezmt/docs-private into amberjack 2019-05-20 12:41:20 -07:00
Maria Bermudez 740512042a Backup, restore, and disaster recovery refactor (#1094)
* Consolidation/cleanup

* Minor wording update

* Clean up files and fix broken links
2019-05-20 12:30:30 -07:00
paigehargrave 1591d9615f Update release-notes.md 2019-05-20 12:30:30 -07:00
Maria Bermudez 21f3e6fe1c Fix conflicts 2019-05-20 12:30:15 -07:00
Sebastiaan van Stijn a76ee08046 Update docker cli reference for 19.03
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-20 12:27:49 -07:00
Maria Bermudez fb69898139 Add copy of working with template 2019-05-20 12:25:15 -07:00
Maria Bermudez 58f14d31e9 Remove crud files 2019-05-20 12:22:55 -07:00
Maria Bermudez 5a17e3c932 Fix merge conflicts 2019-05-20 12:21:29 -07:00
Maria Bermudez 59c101b5ee Fix indentation issue 2019-05-20 11:57:59 -07:00
paigehargrave 4cbdb6b27d Moved to interlock-vip info 2019-05-20 11:57:59 -07:00
paigehargrave 60dc2ccd6a Raw content addition 2019-05-20 11:57:59 -07:00
usha-mandya 1caa8a19af replaced hardcoded names with 'username' 2019-05-20 11:57:13 -07:00
usha-mandya b9991613dc Added CLI reference, updated toc, fixed broken links 2019-05-20 11:55:53 -07:00
usha-mandya 1c7721b37b 1006 - Adding Docker Template content 2019-05-20 11:54:16 -07:00
usha-mandya 954489bfe6 Add Assemble docs 2019-05-20 11:47:16 -07:00
usha-mandya 14ece8c81a fix pending review comments 2019-05-20 11:38:33 -07:00
usha-mandya e69c1e3807 Fix review comments from Mathieu and Guillaume 2019-05-20 11:33:01 -07:00
usha-mandya d3b66b4a2a Address review comments from Ben and GuillaumeT 2019-05-20 11:23:07 -07:00
Ally Smith 0ae1a0abde 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.
2019-05-20 11:18:16 -07:00