Commit Graph

20 Commits

Author SHA1 Message Date
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 4c95d161ca.
2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 14080c18bd.
2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 14:47:31 -07:00
Tammy Fox e4afd61727
Merge pull request #6972 from carlfischer1/patch-4
Update Windows install instructions to support multiple channels
2018-08-24 16:11:37 -04:00
Tammy Fox 6cafc370d6
don't link to "here" 2018-08-24 16:11:15 -04:00
Carl Fischer 8349e9803f
Update docker-ee.md
fix update procedure
2018-07-27 08:44:20 -07:00
Carl Fischer bc3a940d95
Update docker-ee.md
revert to hard-coded 18.03 version to match command line
2018-07-27 08:12:17 -07:00
Carl Fischer a9aa3ebe84
formatting 2018-07-25 08:18:46 -07:00
Carl Fischer 45b186399c
Update docker-ee.md
add commands for updating DockerMsftProvider module
2018-07-25 08:05:13 -07:00
Tammy Fox 060617ae04
add back variables too 2018-07-02 17:55:42 -04:00
Tammy Fox d7c6f633a7
add script install section back 2018-07-02 17:09:04 -04:00
Carl Fischer 24ca3f73db
Update docker-ee.md
add instructions for working with the newly supported multiple version channels
2018-06-29 15:27:50 -07:00
Joao Fernandes dde14cad56
Engine 18.03 (#6948)
* Improve description for multiple tiers
* Update EE engine installation
* Add release notes for engine 18.03.1-ee-1
2018-06-27 14:39:23 -07:00
Olly 4c5f0ab7a6 Updated Windows EE Engine install for UCP 3.0.2 (#6939)
* Updated install docs for UCP 3.0.2

Signed-off-by: ollypom <oppomeroy@gmail.com>

* Updated Join instructions too

Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-06-27 12:48:26 -07:00
Adam Kobi 8305c23792 updated instructions for manual install
Before extracting the archive you must stop the service or the file docker.exe can't be overwritten.
Additionally need to use -Force
2018-06-15 15:20:19 -07:00
Paulo Marques 5cefff6be0 Included a step to verify if Windows needs a restart (#5920) 2018-04-11 10:54:41 -07:00
carlfischer1 10a3d4576d Update docker-ee.md (#6064)
minor formatting fix and sample output correction
2018-02-23 15:13:47 -08:00
carlfischer1 88795e75f4 Update docker-ee.md (#5993)
Restore Docker install docs for Windows Server to their original form using DockerMsftProvider for consistency with Microsoft docs. DockerProvider will be used for Insider/Preview builds only.
2018-02-23 11:54:39 -08:00
Misty Stanley-Jones a55ddf60a9
Move /engine/installation to /install (#5651)
* Move /engine/installation to /install

* Add Docker for IBM Cloud to the matrix
2018-01-26 10:29:14 -08:00